[Pkg-sql-ledger-commit] r710 - in ledger-smb: branches/v1.3/debian tags/1.3.40-1/debian

[pkg-sql-ledger-commit-owner at lists.alioth.debian.org]

Author: jame-guest
Date: 2014-07-12 21:39:33 +0000 (Sat, 12 Jul 2014)
New Revision: 710

Modified:
   ledger-smb/branches/v1.3/debian/changelog
   ledger-smb/tags/1.3.40-1/debian/changelog
Log:
Correct debian/changelog for 1.3.40-1.

Modified: ledger-smb/branches/v1.3/debian/changelog
===================================================================
--- ledger-smb/branches/v1.3/debian/changelog	2014-07-12 18:54:36 UTC (rev 709)
+++ ledger-smb/branches/v1.3/debian/changelog	2014-07-12 21:39:33 UTC (rev 710)
@@ -40,11 +40,7 @@
   * Add empty directory 'UI/logout/' to ledgersmb.lintian-overrides file.
   * Update README.Debian, TODO.Debian, and NEWS.Debian files for new release.
 
-<<<<<<< HEAD
- -- Robert James Clay <jame at rocasa.us>  Tue, 08 Apr 2014 17:33:54 -0400
-=======
  -- Robert James Clay <jame at rocasa.us>  Mon, 21 Apr 2014 17:56:33 -0400
->>>>>>> 8ea2af24f6a73d14f642cb609e436fe5ed7b073b
 
 ledgersmb (1.3.25-1) unstable; urgency=low
 

Modified: ledger-smb/tags/1.3.40-1/debian/changelog
===================================================================
--- ledger-smb/tags/1.3.40-1/debian/changelog	2014-07-12 18:54:36 UTC (rev 709)
+++ ledger-smb/tags/1.3.40-1/debian/changelog	2014-07-12 21:39:33 UTC (rev 710)
@@ -40,11 +40,7 @@
   * Add empty directory 'UI/logout/' to ledgersmb.lintian-overrides file.
   * Update README.Debian, TODO.Debian, and NEWS.Debian files for new release.
 
-<<<<<<< HEAD
- -- Robert James Clay <jame at rocasa.us>  Tue, 08 Apr 2014 17:33:54 -0400
-=======
  -- Robert James Clay <jame at rocasa.us>  Mon, 21 Apr 2014 17:56:33 -0400
->>>>>>> 8ea2af24f6a73d14f642cb609e436fe5ed7b073b
 
 ledgersmb (1.3.25-1) unstable; urgency=low