Remove after resolving conflict.

diff --git a/horde/scripts/sql/horde_histories.mysql.sql b/horde/scripts/sql/horde_histories.mysql.sql
deleted file mode 100644 (file)
index 8f279ad..0000000
--- a/horde/scripts/sql/horde_histories.mysql.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-CREATE TABLE horde_histories (
-    history_id       INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    object_uid       VARCHAR(255) NOT NULL,
-    history_action   VARCHAR(32) NOT NULL,
-    history_ts       BIGINT NOT NULL,
-    history_desc     TEXT,
-    history_who      VARCHAR(255),
-    history_extra    TEXT
-);
-
-CREATE INDEX history_action_idx ON horde_histories (history_action);
-CREATE INDEX history_ts_idx ON horde_histories (history_ts);
-CREATE INDEX history_uid_idx ON horde_histories (object_uid);