Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings
forked frompoise/python

Commit2466ea8

Browse files
committed
- Fix a bad merge of .gitignore
Signed-off-by: Scott M. Likens <scott@likens.us>
1 parentd67e2ef commit2466ea8

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

‎.gitignore

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<<<<<<<HEAD
21
.vagrant
32
Berksfile.lock
43
*~
@@ -15,9 +14,3 @@ bin/*
1514
.bundle/*
1615
.kitchen/
1716
.kitchen.local.yml
18-
=======
19-
.bundle/
20-
.kitchen/
21-
.kitchen.local.yml
22-
*.lock
23-
>>>>>>>-ImprovethetestingofthePythonCookbook

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp