I hate conflicted merges

2008-12-06 22:44:28 -05:00
parent 4879710431 4f0228e99f
commit 570d3c6ec5
23 changed files with 169 additions and 181 deletions
--- a/example/.cvsignore
+++ b/example/.cvsignore
@@ -1,30 +0,0 @@
-.cvsignore
-.deps
-.gdb_history
-.libs
-Makefile
-Makefile.in
-audio
-cdio-eject
-cdtext
-copying
-device
-drives
-eject
-isofile
-isofile2
-isolist
-isolsn
-isofuzzy
-mmc1
-mmc2
-mmc2a
-mmc3
-paranoia
-paranoia2
-sample?
-tracks
-udf1
-udf2
-cdchange
-udffile
--- a/example/.gitignore
+++ b/example/.gitignore
@@ -1,6 +1,10 @@
 /*.o
 /.deps
 /.libs
+<<<<<<< HEAD:example/.gitignore
+=======
+/*~
+>>>>>>> 4f0228e99f37dedd16bc56df7b3982b589cf4122:example/.gitignore
 /Makefile
 /Makefile.in
 /audio