[paraview] 02/08: Fix conficting parts.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository paraview.

commit dc36b801130359e874579ac935d57d657970fd06
Author: Anton Gladky <gladk at debian.org>
Date:   Wed May 14 22:03:11 2014 +0200

    Fix conficting parts.
---
 debian/changelog      | 3 ---
 debian/patches/series | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eda53c7..9328875 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 paraview (4.0.1+dfsg-1) unstable; urgency=medium
 
   [ Christophe Trophime ]
@@ -13,7 +11,6 @@ paraview (4.0.1+dfsg-1) unstable; urgency=medium
 
  -- Anton Gladky <gladk at debian.org>  Thu, 13 Mar 2014 19:58:40 +0100
 
->>>>>>> 4.0b
 paraview (4.0.1-1) unstable; urgency=low
 
   * [8b91fed] Use packages eigen3 instead of embedded.
diff --git a/debian/patches/series b/debian/patches/series
index 42c04a1..37881eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
 fix_manpages_errors.patch
-<<<<<<< HEAD
-=======
 use_system_json.patch
 fix_libav10.patch
->>>>>>> 4.0b

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