[96341] trunk/dports/databases/mariadb/Portfile

[pixilla at macports.org]

Revision: 96341
          https://trac.macports.org/changeset/96341
Author:   pixilla at macports.org
Date:     2012-08-07 07:09:13 -0700 (Tue, 07 Aug 2012)
Log Message:
-----------
databases/mariadb:
- Fix svn resolution error.

Modified Paths:
--------------
    trunk/dports/databases/mariadb/Portfile

Modified: trunk/dports/databases/mariadb/Portfile
===================================================================
--- trunk/dports/databases/mariadb/Portfile	2012-08-07 14:02:18 UTC (rev 96340)
+++ trunk/dports/databases/mariadb/Portfile	2012-08-07 14:09:13 UTC (rev 96341)
@@ -3,7 +3,6 @@
 
 PortSystem          1.0
 
-<<<<<<< .mine
 name                mariadb
 set name_mysql      ${name}
 version             5.5.25
@@ -14,16 +13,6 @@
 platforms           darwin
 license             GPL-2
 maintainers         pixilla openmaintainer
-=======
-name                    mariadb
-conflicts               mysql5-devel mysql5 mysql4
-version                 5.2.9
-revision                4
-categories              databases
-platforms               darwin
-license                 GPL-2
-maintainers             nomaintainer
->>>>>>> .r96339
 
 if {$subport == $name} {
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120807/58da17d4/attachment.html>