aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAdelyn Breedlove <[email protected]>2018-11-10 20:45:33 +0000
committerAdelyn Breedlove <[email protected]>2018-11-10 20:45:33 +0000
commit5a37b7fcebc27679a75d003feb47a733f608993e (patch)
tree900f064176e0a0d748d3773db81dda54646604cd /.gitignore
parentMerge branch 'dev' into 'master' (diff)
parentAdd test executable to repo (diff)
downloaddisml-5a37b7fcebc27679a75d003feb47a733f608993e.tar.xz
disml-5a37b7fcebc27679a75d003feb47a733f608993e.zip
Merge branch 'dev' into 'master'
Add test executable to repo See merge request Mishio595/animus!2
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 9834a20..297e7e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
.merlin
-_build/
-bin/ \ No newline at end of file
+_build/ \ No newline at end of file