From bd68aae78a5d696e4ccb9c0d267486c283a6d9d2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 08:49:59 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master

---
 install/sql/incremental/upd_0033.sql |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/install/sql/incremental/upd_0033.sql b/install/sql/incremental/upd_0033.sql
index d5ea973..d4b3c0d 100644
--- a/install/sql/incremental/upd_0033.sql
+++ b/install/sql/incremental/upd_0033.sql
@@ -1,4 +1,4 @@
-CREATE TABLE IF NOT EXISTS `client_circle` (
+CREATE TABLE IF NOT EXISTS `client_circle` (
   `circle_id` int(11) NOT NULL AUTO_INCREMENT,
   `sys_userid` int(11) NOT NULL DEFAULT '0',
   `sys_groupid` int(11) NOT NULL DEFAULT '0',

--
Gitblit v1.9.1