[grass] 01/01: changelog: 7.0.5~rc1-1~exp1~trusty1 -> 7.0.5~rc1-1~exp1~trusty

[Martin Landa]

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

martinl-guest pushed a commit to branch ubuntugis/trusty
in repository grass.

commit dbb2711cd714a1317d48dd79db73f54431d73a33
Author: Martin Landa <landa.martin at gmail.com>
Date:   Fri Sep 16 10:40:19 2016 +0200

    changelog: 7.0.5~rc1-1~exp1~trusty1 -> 7.0.5~rc1-1~exp1~trusty
---
 debian/changelog | 2 +-
 debian/control   | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 02ed317..762f373 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-grass (7.0.5~rc1-1~exp1~trusty) trusty; urgency=medium
+grass (7.0.5~rc1-1~exp1~trusty1) trusty; urgency=medium
 
   * Rebuild for trusty.
 
diff --git a/debian/control b/debian/control
index 1477f6e..e12e77a 100644
--- a/debian/control
+++ b/debian/control
@@ -106,11 +106,7 @@ Suggests: grass-doc,
 Breaks: grass (<< 6.4.2-1~)
 Conflicts: grass70-core,
            grass7-core
-<<<<<<< HEAD
 Provides: grass703-2,
-=======
-Provides: grass705-1,
->>>>>>> debian/7.0.5.rc1-1.exp1
           grass70-core,
           grass7-core
 Replaces: grass70-core,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git