Permalink
Browse files

Fixed even moar conflicts

  • Loading branch information...
1 parent 0b58c44 commit 34aa994a37ec4464c2db2e2d8fe2a6e39813cef1 Nicola 'tekNico' Larosa committed Apr 28, 2016
Showing with 1 addition and 0 deletions.
  1. +1 −0 .gitignore
View
@@ -16,3 +16,4 @@ obj
/deps/*.vsn
/src/programs.inc
.images
+/lib/luajit/usr

0 comments on commit 34aa994

Please sign in to comment.