diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2013-09-27 17:07:44 +0300 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2013-09-27 17:07:44 +0300 |
| commit | decd08408b7802543cd953c2f6b396e70ee865d2 (patch) | |
| tree | 1e95d98287cc2c5a7731cae4370d84df205194cb /debian | |
| parent | 6a6522319316204bbe46d52140151935ecde938f (diff) | |
| download | mariadb-git-decd08408b7802543cd953c2f6b396e70ee865d2.tar.gz | |
Fix merge error.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/dist/Debian/control | 2 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/control | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index 9276d122105..d2962c0cd7a 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -11,8 +11,6 @@ Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files Vcs-Bzr: bzr://lp:maria Package: mariadb-galera-server-5.5 -Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33), - mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3 Architecture: any Suggests: tinyca, mailx, mariadb-test Recommends: libhtml-template-perl diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control index eeb55109766..7234fdb8bfb 100644 --- a/debian/dist/Ubuntu/control +++ b/debian/dist/Ubuntu/control @@ -11,8 +11,6 @@ Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files Vcs-Bzr: bzr://lp:maria Package: mariadb-galera-server-5.5 -Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33), - mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3 Architecture: any Suggests: tinyca, mailx, mariadb-test Recommends: libhtml-template-perl |