summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAdrien Hopkins <ahopk127@my.yorku.ca>2021-03-13 16:21:49 -0500
committerAdrien Hopkins <ahopk127@my.yorku.ca>2021-03-13 16:21:49 -0500
commitfe4135a68cfed92ef336eec663e9c42c2c97dcbc (patch)
tree2fcf583265be3c575086f3ce3183a3268c997538 /.gitignore
parent761ba0b6627df8bc9f6ab41c94f349c84d378609 (diff)
parent184b7cc697ffc2dcbd49cfb3d0fd7b14bdac8803 (diff)
Merge branch 'feature-settings-tab' into develop
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 52a523a..1d7e13f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
bin/
target/
*.class
-*~ \ No newline at end of file
+*~
+settings.txt \ No newline at end of file