diff options
| author | Ben Beltran <ben@nsovocal.com> | 2014-02-03 09:51:29 -0600 |
|---|---|---|
| committer | Ben Beltran <ben@nsovocal.com> | 2014-02-03 09:51:29 -0600 |
| commit | 830829dec0596760d0cba38d959ab2646112f61b (patch) | |
| tree | 144f048e1257801338e34832fa59c89d34decc04 | |
| parent | 3de51c6f55d304f038df1b77c8ab346e2a187fe1 (diff) | |
Proper merge for gitignore
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -1,4 +1,3 @@ -<<<<<<< HEAD # Object files *.o @@ -168,4 +167,3 @@ $RECYCLE.BIN/ # Mac crap .DS_Store ->>>>>>> bca44639c27169b0643de1b56361e6c2958d1d4a |