aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorUnknown <jtsshieh@outlook.com>2018-03-09 21:33:00 -0500
committerUnknown <jtsshieh@outlook.com>2018-03-09 21:33:00 -0500
commit1cec12510402bc24e81d9716a51d45797eca3033 (patch)
treeb6741cd79ad93ccedcf99d86636e2e804427f2f8 /.gitignore
parent214506cbe5249cd1a274aa15b1b83b1491f5df9e (diff)
downloadPokeBot-1cec12510402bc24e81d9716a51d45797eca3033.tar.gz
PokeBot-1cec12510402bc24e81d9716a51d45797eca3033.tar.bz2
PokeBot-1cec12510402bc24e81d9716a51d45797eca3033.zip
Auto stash before merge of "master" and "origin/master"
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 3951b6b..9315881 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ node_modules
config.json
*.json
+*.sqlite