gitignore seems to have an undisclosed conflict?! fixed here.
This commit is contained in:
parent
724c765028
commit
c8d1287e10
|
@ -7,12 +7,9 @@
|
|||
*.so
|
||||
*.so.*
|
||||
*.exe
|
||||
<<<<<<< Updated upstream
|
||||
*.dll
|
||||
*.class
|
||||
*.jar
|
||||
=======
|
||||
>>>>>>> Stashed changes
|
||||
|
||||
qemu/config-all-devices.mak
|
||||
|
||||
|
|
Loading…
Reference in New Issue