Adrianna: We *can* spell your name correctly

[naja.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 7e4c07b2907600e9682394636595041d2b08d11e..f7f4168673fee9ab2d64b1486f95141ac1b005fd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
 *.so
 *.egg
 *.egg-info
+*.orig
+*.rej
 .*.swp
 *~
 dist
@@ -9,3 +11,4 @@ build
 py2exe.log
 VE
 ve
+/data/location_decks/*.json