[SCM] BOINC packaging branch, debian-folder-release, updated. a276f60cf02f456e5d709bdf33f69a38131bf56e

[Gianfranco Costamagna]

The following commit has been merged in the debian-folder-release branch:
commit a276f60cf02f456e5d709bdf33f69a38131bf56e
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Mar 4 14:45:22 2013 +0100

    Fix in merge

diff --git a/debian/changelog b/debian/changelog
index 8660f5f..62f03e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -59,11 +59,7 @@ boinc (7.0.46+dfsg-1) UNRELEASED; urgency=low
 boinc (7.0.45+dfsg-1) experimental; urgency=low
 
   * New upstream release
-<<<<<<< HEAD
   * Removed boinc zip library from client builds.
-=======
-  * Removed boinc zip library from client builds
->>>>>>> 9a9498dba72f6f007629f8d8d04791df255f6a21
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 25 Jan 2013 00:01:24 +0100
 

-- 
BOINC packaging