From 9bc936e01858c67891f4c23c1ce671949ffc0436 Mon Sep 17 00:00:00 2001
From: Christian Perrier <bubulle@debian.org>
Date: Wed, 30 Apr 2014 22:53:53 +0200
Subject: [PATCH] Fix conflict in debian/changelog

---
 debian/changelog | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c914c638..16f39eb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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