Skip to content

Y
ygopro-2pick
Commit 354e711a authored by nanahira's avatar nanahira
Browse files
Options

Update .gitignore

parent 395fc49f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
.gitignore
View file @ 354e711a
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
/gframe/dirent.h /gframe/dirent.h
ygopro ygopro
premake5.exe premake5.exe
<<<<<<< HEAD
/ygopro-7210srv /ygopro-7210srv
/temp /temp
...@@ -32,7 +31,7 @@ premake5.exe ...@@ -32,7 +31,7 @@ premake5.exe
/irrlicht-1.8.4 /irrlicht-1.8.4
/irrlicht /irrlicht
/lua-5.2.4 /lua-5.2.4
=======
/expansions/pics /expansions/pics
/pics /pics
>>>>>>> 984630f8031c564a86e88c45ce43b73c5bc5f75d
/data
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment