fix database migration

This commit is contained in:
Peter Hormanns 2013-04-30 12:42:51 +02:00
commit cfbab5dbbd

View File

@ -54,7 +54,10 @@ ALTER TABLE component
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;