- Fix a bad merge of .gitignore

scottmlikens · scottmlikens · commit 2466ea893b63 · 2013-06-27T01:39:33.000Z
Signed-off-by: Scott M. Likens &lt;scott@likens.us&gt;
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 .vagrant
 Berksfile.lock
 *~
@@ -15,9 +14,3 @@ bin/*
 .bundle/*
 .kitchen/
 .kitchen.local.yml
-=======
-.bundle/
-.kitchen/
-.kitchen.local.yml
-*.lock
->>>>>>>   - Improve the testing of the Python Cookbook
