database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Fix merge error.

Browse Source
This commit is contained in:
Jan Lindström
2013-09-27 17:07:44 +03:00
parent 6a65223193
commit decd08408b
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
debian/dist/Debian/control vendored
View File

@@ -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

2
debian/dist/Ubuntu/control vendored
View File

@@ -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