alex/copycat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into revision-2.0

Browse Source
This commit is contained in:
LSaldyt
2017-12-04 12:11:32 -07:00
parent d1b8100c2c bb4f758a39
commit 25c0fbf3ab
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -31,6 +31,7 @@ copycat.log
# Output
output/*
<<<<<<< HEAD
copycat.log
papers/*.log
papers/*.pdf
@ -38,3 +39,5 @@ papers/*.out
papers/*.aux
papers/words
*.txt
=======
>>>>>>> develop