From ce6e1ddfd09c47fc3f80e4fccc238894cf560ddb Mon Sep 17 00:00:00 2001
From: A. Täffner <darkalex@firesplash.de>
Date: Fri, 22 Jan 2016 13:16:39 -0500
Subject: [PATCH] updated master, resolved conflicts
---
install/sql/incremental/upd_dev_collection.sql | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 19ed0a0..88b830e 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -212,4 +212,3 @@
ADD COLUMN `dnssec_initialized` ENUM('Y','N') NOT NULL DEFAULT 'N',
ADD COLUMN `dnssec_wanted` ENUM('Y','N') NOT NULL DEFAULT 'N',
ADD COLUMN `dnssec_info` TEXT NULL;
-
--
Gitblit v1.9.1