DMC/scipro
7
0
Fork 0
Code Issues44 Pull Requests6 Actions Projects1 Releases Wiki Activity

erased commented out stuff

Browse Source
This commit is contained in:
fred-fri 2013-08-15 14:22:13 +09:00
parent 6ad5af4697
commit 6d4d694755
1 changed files with 1 additions and 11 deletions

12
resources/db_update_scripts/current.sql

@ -1,12 +1,3 @@
# <<<<<<< HEAD
# =======
# ALTER TABLE `general_system_settings` ADD `thesisReviewsMandatory` tinyint(1) NOT NULL;
#
# ALTER TABLE `forum_posts` ADD `attachment_id` bigint(20) DEFAULT NULL;
# ALTER TABLE `forum_posts` ADD CONSTRAINT `FKEDDC4F35CCABB192` FOREIGN KEY (`attachment_id`) REFERENCES `file_description` (`id`);
#
# ALTER TABLE `general_system_settings` ADD `thesisCommentNoDaysAheadReminder` int(11) NOT NULL;
--
-- Table structure for table `target`
--
@ -31,5 +22,4 @@ ALTER TABLE `target`
ADD CONSTRAINT `FKCB7E7191A520201Eb` FOREIGN KEY (`projectClassId`) REFERENCES `project_class` (`id`);
DROP TABLE Employee_countActiveFromDates;
DROP TABLE Employee_projectLimits;
# >>>>>>> develop2
DROP TABLE Employee_projectLimits;