Fix conflict in debian/changelog

2014-04-30 22:53:53 +02:00
parent 2ef82ecb53
commit 9bc936e018
1 changed files with 0 additions and 6 deletions
@@ -15,15 +15,9 @@ shadow (1:4.2-2) UNRELEASED; urgency=low
    This will allow initscripts to drop /etc/init.d/motd.
    Closes: #741129

-<<<<<<< HEAD
-  [ Trần Ngọc Quân ]
-  * Vietnamese translation update.
-
  [ Laurent Bigonville ]
  * Enable libaudit support. Closes: #745774

-=======
->>>>>>> parent of 0274441... Vietnamese translation update.
 -- Christian Perrier <bubulle@debian.org>  Wed, 30 Apr 2014 22:14:23 +0200

 shadow (1:4.2-1) experimental; urgency=low