Fixed even moar conflicts

snabbco · Apr 28, 2016 · 34aa994 · 34aa994
1 parent 0b58c44
commit 34aa994
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ obj
 /deps/*.vsn
 /src/programs.inc
 .images
+/lib/luajit/usr