[SCM] graphlcd-base packaging repository branch, master, updated. debian/0.1.5-5-6-g5f6495b

[etobi]

The following commit has been merged in the master branch:
commit 5f6495b8ef3cb75e19910c00eb80afb676d3e427
Author: etobi <git at e-tobi.net>
Date:   Wed May 9 19:53:00 2012 +0200

    Fixed debian/control

diff --git a/debian/control b/debian/control
index ec19b05..65ecf70 100644
--- a/debian/control
+++ b/debian/control
@@ -10,11 +10,7 @@ Provides: libglcddrivers-dev
 Conflicts: libglcddrivers-dev, libglcddrivers1 (<< 0.1.9)
 Section: libdevel
 Architecture: any
-<<<<<<< HEAD
 Depends: ${misc:Depends}, libglcddrivers1 (= ${binary:Version})
-=======
-Depends: ${misc:Depends}, libglcddrivers1 (= ${Source-Version})
->>>>>>> c7fd17d... Added missing misc:Depends
 Description: Development files for the GraphLCD drivers library
  The GraphLCD drivers library provides a common interface for programming
  different graphical LC displays. Special devices for frambuffer and

-- 
graphlcd-base packaging repository