From a904cc23ec98517e225fb5954b348551a096b6e8 Mon Sep 17 00:00:00 2001
From: "R. Bernstein" <rocky@sanchez.(none)>
Date: Sat, 6 Dec 2008 22:46:14 -0500
Subject: [PATCH] Resolve conflicted files.

---
 example/.gitignore    | 3 ---
 lib/driver/.gitignore | 5 +----
 test/.gitignore       | 3 ---
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/example/.gitignore b/example/.gitignore
index 238d2312..dfb999cc 100644
--- a/example/.gitignore
+++ b/example/.gitignore
@@ -1,10 +1,7 @@
 /*.o
 /.deps
 /.libs
-<<<<<<< HEAD:example/.gitignore
-=======
 /*~
->>>>>>> 4f0228e99f37dedd16bc56df7b3982b589cf4122:example/.gitignore
 /Makefile
 /Makefile.in
 /audio
diff --git a/lib/driver/.gitignore b/lib/driver/.gitignore
index acc40c5b..c5c74f3b 100644
--- a/lib/driver/.gitignore
+++ b/lib/driver/.gitignore
@@ -2,10 +2,7 @@
 /*.o
 /.deps
 /.libs
-<<<<<<< HEAD:lib/driver/.gitignore
-=======
-/*.c~
->>>>>>> 4f0228e99f37dedd16bc56df7b3982b589cf4122:lib/driver/.gitignore
+/*~
 /Makefile
 /Makefile.in
 /libcdio.la
diff --git a/test/.gitignore b/test/.gitignore
index 81d3441e..7f8e272c 100644
--- 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