From: aph <aph@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Fri, 29 Aug 2003 15:12:51 +0000 (+0000)
Subject: remove conflict artifact
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c7c703ea4d9fdc9f79c4d61c97b8214fa7cfa354;p=developers-reference.git

remove conflict artifact


git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@2411 313b444b-1b9f-4f58-a734-7bb04f332e8d
---

diff --git a/debian/changelog b/debian/changelog
index c77679c..ea0551f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,6 @@ developers-reference (3.3.4) WORKING VERSION; urgency=low
   
  -- Adam Di Carlo <aph@debian.org>  Mon, 16 Jun 2003 04:22:22 -0400
 
->>>>>>> 1.168
 developers-reference (3.3.3) unstable; urgency=low
 
   * Frédéric Bothamy