Fixed changelog.

diff --git a/debian/changelog b/debian/changelog
index a912755090034117ab79ff5b3ff0380f540d114b..9f4d0f0180672262eafb09776fbb32d6e7804f90 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,18 +27,6 @@ openvswitch (2.10.0+2018.08.28+git.8ca7c82b7d+ds1-12) unstable; urgency=medium
 
  -- Thomas Goirand <zigo@debian.org>  Sun, 14 Apr 2019 00:25:19 +0200
 
-openvswitch (2.10.0+2018.08.28+git.8ca7c82b7d+ds1-11) unstable; urgency=medium
-
-  * Removes network.service from openvswitch-switch.service to avoid a
-    dependency loop in systemd, leading to removal of networking.service.
-    Also use "ip link set DEVNAME up" instead of ifconfig, and runtime
-    depend on iproute2.
-    Thanks to Benjamin Drung for the bug report (Closes: #924562) and to
-    Jonathan Dupart for the patch as a merge request in Salsa.
-
- -- Thomas Goirand <zigo@debian.org>  Sun, 31 Mar 2019 00:50:26 +0100
->>>>>>> debian/stein
-
 openvswitch (2.10.0+2018.08.28+git.8ca7c82b7d+ds1-11) unstable; urgency=medium
 
   * Removes network.service from openvswitch-switch.service to avoid a