debian/changelog | 7 -------
1 file changed, 7 deletions(-)
New commits:
commit 017b481afc7fb84d969c796ea3a8c58c7b704c9b
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Thu Feb 25 16:11:03 2010 -0800
git hates me
diff --git a/debian/changelog b/debian/changelog
index 7563577..843f300 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,14 +17,7 @@ xorg (1:7.5+1ubuntu9) lucid; urgency=low
[ Timo Aaltonen ]
* debian/x11-common.links: Add xf86-input-evtouch and -wacom.
-<<<<<<< HEAD:debian/changelog
- -- Bryce Harrington <br...@ubuntu.com> Thu, 25 Feb 2010 15:07:29 -0800
-=======
- [ Timo Aaltonen ]
- * debian/x11-common.links: Add xf86-input-evtouch and -wacom.
-
-- Bryce Harrington <br...@ubuntu.com> Tue, 23 Feb 2010 18:45:03 -0800
->>>>>>> 29c9d8bb69670f9174d34e2fa8578bc4ad11c6bf:debian/changelog
xorg (1:7.5+1ubuntu8) lucid; urgency=low
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1nkno8-0000ae...@alioth.debian.org
