[subversion-commit] SVN tetex-bin commit + diffs: r982 - tetex-bin/trunk/debian

[Frank Küster]

Author: frank
Date: 2006-03-02 11:37:56 +0000 (Thu, 02 Mar 2006)
New Revision: 982

Modified:
   tetex-bin/trunk/debian/changelog
Log:
remove conflict markers, sorry

Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog	2006-03-02 11:36:19 UTC (rev 981)
+++ tetex-bin/trunk/debian/changelog	2006-03-02 11:37:56 UTC (rev 982)
@@ -11,11 +11,7 @@
     building formats based on latex.fmt without cluttering stdout (closes:
     #354604) [frank]
 
-<<<<<<< .mine
  -- Frank Küster <frank at debian.org>  Thu,  2 Mar 2006 12:36:23 +0100
-=======
- -- Norbert Preining <preining at logic.at>  Sat, 25 Feb 2006 19:34:13 +0100
->>>>>>> .r980
 
 tetex-bin (3.0-14) unstable; urgency=low