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

diff --git a/.gitignore b/.gitignore
index 7e4c07b..2e6f0cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
 *.so
 *.egg
 *.egg-info
+*.orig
+*.rej
 .*.swp
 *~
 dist
@@ -9,3 +11,5 @@ build
 py2exe.log
 VE
 ve
+/data/location_decks/*.json
+/data/location_decks/puzzles/*.json