summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAdrien Hopkins <ahopk127@my.yorku.ca>2021-08-26 15:18:30 -0400
committerAdrien Hopkins <ahopk127@my.yorku.ca>2021-08-26 15:18:30 -0400
commitc4ae6887c32ee8d2e9e8853ffd12721d4db2fd3b (patch)
treeb51679f692e90292901669d2c1bccad347c25434 /.gitignore
parent360b4261ebb9b65dcf91a6e49c5d23784e592945 (diff)
parent54e481cdb7115b236bcddb86b785d88dcc757c39 (diff)
Merge branch 'develop'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index eb4cd1a..5be4b77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ build
# Unit Converter gitignore files
*.class
*~
-settings.txt \ No newline at end of file
+settings.txt
+/bin/