claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve conflicted files.

Browse Source
This commit is contained in:
R. Bernstein
2008-12-06 22:46:14 -05:00
parent 570d3c6ec5
commit a904cc23ec
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
example/.gitignore vendored
View File

@@ -1,10 +1,7 @@
/*.o
/.deps
/.libs
<<<<<<< HEAD:example/.gitignore
=======
/*~
>>>>>>> 4f0228e99f37dedd16bc56df7b3982b589cf4122:example/.gitignore
/Makefile
/Makefile.in
/audio