Tim Starling has submitted this change and it was merged.

Change subject: Merge branch 'debian' into debian-trusty
......................................................................


Merge branch 'debian' into debian-trusty

Change-Id: I9a2c3a4bdb3bf03eb821c53a4d1ec8c49a6efa11
---
M debian/changelog
1 file changed, 6 insertions(+), 8 deletions(-)

Approvals:
  Tim Starling: Verified; Looks good to me, approved



diff --git a/debian/changelog b/debian/changelog
index c0e2b7f..f868901 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,15 @@
-<<<<<<< HEAD   (c3cdaa Merge branch 'debian' into debian-trusty)
-html5depurate (1.1.3~trusty) trusty; urgency=medium
-
-  * Backport to trusty
-
- -- Tim Starling <tstarl...@wikimedia.org>  Fri, 11 Nov 2016 14:32:14 +1100
-=======
 html5depurate (1.1.4) unstable; urgency=medium
 
   * Eliminate edge cases from p-wrapping and block tag interaction (patch by
     Subramanya Sastry).
 
  -- Tim Starling <tstarl...@wikimedia.org>  Fri, 02 Dec 2016 10:23:21 +1100
->>>>>>> BRANCH (5364fe Changelog for package version 1.1.4)
+
+html5depurate (1.1.3~trusty) trusty; urgency=medium
+
+  * Backport to trusty
+
+ -- Tim Starling <tstarl...@wikimedia.org>  Fri, 11 Nov 2016 14:32:14 +1100
 
 html5depurate (1.1.3) unstable; urgency=medium
 

-- 
To view, visit https://gerrit.wikimedia.org/r/324830
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a2c3a4bdb3bf03eb821c53a4d1ec8c49a6efa11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/html5depurate
Gerrit-Branch: debian-trusty
Gerrit-Owner: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to