Resolve conflicted files.

2008-12-06 22:46:14 -05:00
parent 570d3c6ec5
commit a904cc23ec
3 changed files with 1 additions and 10 deletions
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -21,11 +21,8 @@
 /testassert
 /testbincue
 /testbincue.c
-<<<<<<< HEAD:test/.gitignore
-=======
 /testdefault
 /testgetdevices
->>>>>>> 4f0228e99f37dedd16bc56df7b3982b589cf4122:test/.gitignore
 /testischar
 /testiso9660
 /testisocd