Aaron Honeycutt has proposed merging 
~aaronhoneycutt/kubuntu-packaging/+git/kalzium:kubuntu_unstable into 
~kubuntu-packagers/kubuntu-packaging/+git/kalzium:kubuntu_unstable.

Requested reviews:
  Rik Mills (rikmills)

For more details, see:
https://code.launchpad.net/~aaronhoneycutt/kubuntu-packaging/+git/kalzium/+merge/311785

Added qtscript5-dev build dep 

-- 
Your team Kubuntu Packagers is subscribed to branch 
~kubuntu-packagers/kubuntu-packaging/+git/kalzium:kubuntu_unstable.
diff --git a/debian/changelog b/debian/changelog
index 83b4339..00f9af6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,11 @@ kalzium (4:16.04.3-0ubuntu2) UNRELEASED; urgency=medium
   * Porting packaging to Kf5
 
   [ Aaron Honeycutt ]
+<<<<<<< debian/changelog
   * Added qtscript5-dev as build dep
+=======
+  * Added qtscript5-dev build dep 
+>>>>>>> debian/changelog
 
  -- José Manuel Santamaría Lema <[email protected]>  Sat, 29 Oct 2016 17:16:39 +0200
 
-- 
kubuntu-devel mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel

Reply via email to