From 9d4bb8679bd2ef0934ac94ae3ccedc864c0078cc Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 02 Mar 2015 11:58:49 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

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