X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=.gitignore;h=f7f4168673fee9ab2d64b1486f95141ac1b005fd;hb=30397c438de56dd2913eef42a7a6bed424234318;hp=7e4c07b2907600e9682394636595041d2b08d11e;hpb=2869b1c5d2babac462a5e2a1309c0370a987b121;p=naja.git

diff --git a/.gitignore b/.gitignore
index 7e4c07b..f7f4168 100644
--- 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