[Pkg-cli-apps-commits] [SCM] monobristol branch, master, updated. debian/0.60.2-1-12-g9cd71b5

[Stefan Ebner]

The following commit has been merged in the master branch:
commit 9cd71b5c43561e1daad06848cac4013b74d877b8
Author: Stefan Ebner <sebner at ubuntu.com>
Date:   Thu Dec 23 16:43:18 2010 +0100

    Revert "Finalize changelog"
    
    This reverts commit bce03bee886e609fa97e1f856b8e36ba6a8770da.
    
    Conflicts:
    
    	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 00049e0..9c1b448 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 monobristol (0.60.3-1) UNRELEASED; urgency=low
 
   * New upstream release
@@ -18,6 +19,9 @@ monobristol (0.60.2-1) experimental; urgency=low
  -- Stefan Ebner <sebner at ubuntu.com>  Wed, 24 Nov 2010 20:31:45 +0100
 
 monobristol (0.60.1-2) unstable; urgency=medium
+=======
+monobristol (0.60.1-2) UNRELEASED; urgency=grave
+>>>>>>> parent of bce03be... Finalize changelog
 
   * Fix external bristol call (Closes: #582581 LP:#660627)
     + debian/patches/02_fix_bristol_call: Added

-- 
monobristol