summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-09-12 00:46:21 -0500
committerBryan Bishop <kanzure@gmail.com>2013-09-12 00:46:21 -0500
commitc80af2798ee369a775d26a6f0d57853c7a91d918 (patch)
tree18494855d7494c63b3ab65d22e62b198ab2da55b
parent0ce2555a1939ebbd97c2539e46af7d5c30480deb (diff)
allow (some) json files in the repo
This ignores only "labels.json", which so far has been the only problematic json file. This is a file generated by gbz80disasm. Other json files might be necessary in the future, and it's okay to let them in.
-rw-r--r--.gitignore4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index a8b43a7..34a7196 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,8 +23,8 @@
# swap files for gedit
*~
-# no data from extras/
-*.json
+# labels.json is auto-generated by gbz80disasm
+labels.json
# for vim configuration
# url: http://www.vim.org/scripts/script.php?script_id=441