[Checkins] SVN: zopyx.smartprintng.server/trunk/docs/HISTORY.txt updated

[Andreas Jung]

Log message for revision 114833:
  updated
  

Changed:
  U   zopyx.smartprintng.server/trunk/docs/HISTORY.txt

-=-
Modified: zopyx.smartprintng.server/trunk/docs/HISTORY.txt
===================================================================
--- zopyx.smartprintng.server/trunk/docs/HISTORY.txt	2010-07-19 05:38:35 UTC (rev 114832)
+++ zopyx.smartprintng.server/trunk/docs/HISTORY.txt	2010-07-19 05:40:03 UTC (rev 114833)
@@ -43,7 +43,6 @@
 ------------------
 * adjusted to newest zopyx.convert2 version
 
->>>>>>> .merge-right.r103965
 0.5.1 (2009/08/01)
 ------------------