gitignore seems to have an undisclosed conflict?! fixed here.

This commit is contained in:
xorstream 2017-01-23 01:13:13 +11:00
parent 724c765028
commit c8d1287e10
1 changed files with 0 additions and 3 deletions

3
.gitignore vendored
View File

@ -7,12 +7,9 @@
*.so
*.so.*
*.exe
<<<<<<< Updated upstream
*.dll
*.class
*.jar
=======
>>>>>>> Stashed changes
qemu/config-all-devices.mak