Skip to content

M
MariaDB
Commit decd0840 authored by Jan Lindström's avatar Jan Lindström
Browse files
Options

Fix merge error.

parent 6a652231
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
debian/dist/Debian/control
View file @ decd0840
...@@ -11,8 +11,6 @@ Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files ...@@ -11,8 +11,6 @@ Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files
Vcs-Bzr: bzr://lp:maria Vcs-Bzr: bzr://lp:maria
Package: mariadb-galera-server-5.5 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 Architecture: any
Suggests: tinyca, mailx, mariadb-test Suggests: tinyca, mailx, mariadb-test
Recommends: libhtml-template-perl Recommends: libhtml-template-perl
......
debian/dist/Ubuntu/control
View file @ decd0840
...@@ -11,8 +11,6 @@ Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files ...@@ -11,8 +11,6 @@ Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files
Vcs-Bzr: bzr://lp:maria Vcs-Bzr: bzr://lp:maria
Package: mariadb-galera-server-5.5 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 Architecture: any
Suggests: tinyca, mailx, mariadb-test Suggests: tinyca, mailx, mariadb-test
Recommends: libhtml-template-perl Recommends: libhtml-template-perl
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7