[petsc] 02/02: Fix conflict

[Christophe Trophime]

This is an automated email from the git hooks/post-receive script.

trophime-guest pushed a commit to branch master
in repository petsc.

commit 80d82ccef5551262f4250f87d0fe78b6c4cd1693
Author: Christophe Trophime <christrophime at googlemail.com>
Date:   Thu Sep 19 13:36:15 2013 +0200

    Fix conflict
---
 debian/changelog |   32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c96b582..dfcab8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,35 +1,3 @@
-<<<<<<< HEAD
-=======
-petsc (3.4.2.dfsg-3) unstable; urgency=low
-
-  * Add g++-4.8.patch (fix missing declarations) 
-
- -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Wed, 18 Sep 2013 11:07:00 +0200
-
-petsc (3.4.2.dfsg-2) unstable; urgency=low
-
-  * debian/rules:
-    - add pastix support
-    - add superlu support
-    - add superlu-dist support
-    - add elemental support
-    - add hypre 2.9.1a support
-  * debian/control:
-    - change libphypre-dev min version
-    - add libpastix-dev to Build-Depends
-    - add libsuperlu4-dev to Build-Depends
-    - add libsuperlu-dist-dev to Build-Depends
-    - add libelemental-dev to Build-Depends
-    
-    [Roland Stigge]
-    - add powerpcspe to build arches to (Closes: #706344)
-    
-  * debian/copyright:
-    - rewritte (Closes: #722979)
-
- -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Mon, 16 Sep 2013 08:10:39 +0200
-
->>>>>>> 9e348e2... Fix missing declaration (found when compiling gmsh with g++-4.8)
 petsc (3.4.2.dfsg-1) unstable; urgency=low
 
   * Team upload.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/petsc.git