kiwix/kiwix-apple
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-apple.git synced 2025-09-14 14:49:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflict in gitignore

Browse Source
This commit is contained in:
Chris Li 2016-08-05 10:43:06 -04:00
parent 2ece7cf9cd
commit 5d38487a85
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -4,9 +4,6 @@ Kiwix/libkiwix/C&C++
Kiwix/libkiwix/include
Kiwix/libkiwix/shared
Kiwix/libkiwix/static
<<<<<<< HEAD
*.a
=======
Kiwix/libkiwix/iOS
Kiwix/libkiwix/macOS
>>>>>>> 1.7