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_0036.sql | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/install/sql/incremental/upd_0036.sql b/install/sql/incremental/upd_0036.sql
index db0d59d..0e5a301 100644
--- a/install/sql/incremental/upd_0036.sql
+++ b/install/sql/incremental/upd_0036.sql
@@ -1,5 +1,4 @@
--- --------------------------------------------------------
+-- --------------------------------------------------------
ALTER TABLE `web_domain` ADD `perl` enum('n','y') NOT NULL default 'n' AFTER `python`;
-
--
Gitblit v1.9.1