From 1c5d97675960ad98305121c775e2a5beae1b575e Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 11 Jul 2008 14:15:13 +0000
Subject: fixed merge regressions

---
 files/config/my.cnf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'files/config/my.cnf')

diff --git a/files/config/my.cnf b/files/config/my.cnf
index b3c1f0b..e15efc3 100644
--- a/files/config/my.cnf
+++ b/files/config/my.cnf
@@ -1,5 +1,5 @@
 [mysqld]
-datadir=/var/lib/mysql/data
+datadir=/var/lib/mysql
 log-bin=/var/lib/mysql
 socket=/var/lib/mysql/mysql.sock
 # Default to using old password format for compatibility with mysql 3.x
-- 
cgit v1.2.3