From cfbab5dbbdff7c72b587c2a72125baa022f2f782 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Tue, 30 Apr 2013 12:42:51 +0200
Subject: [PATCH] fix database migration

---
 hsarback/database/database_update.sql |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/hsarback/database/database_update.sql b/hsarback/database/database_update.sql
index ae88441..9789373 100644
--- a/hsarback/database/database_update.sql
+++ b/hsarback/database/database_update.sql
@@ -54,7 +54,10 @@
 
 ALTER TABLE packet DROP COLUMN order_number;
 ALTER TABLE packet DROP COLUMN webserver_group;
+<<<<<<< HEAD
 ALTER TABLE packet ADD COLUMN free boolean NOT NULL DEFAULT false;
+=======
+>>>>>>> branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git
 
 ALTER TABLE domain DROP COLUMN domain_status;
 ALTER TABLE domain DROP COLUMN domain_status_changed;

--
Gitblit v1.9.0-SNAPSHOT