From 81bac93fb426a98f19b2439625c8836bd4e21225 Mon Sep 17 00:00:00 2001 From: Sean Burke Date: Mon, 9 Sep 2013 14:56:13 -0700 Subject: [PATCH] Fixed bad git characters --- inc/setup/setup.sql | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/inc/setup/setup.sql b/inc/setup/setup.sql index 7951da4..3572e88 100644 --- a/inc/setup/setup.sql +++ b/inc/setup/setup.sql @@ -54,26 +54,6 @@ CREATE TABLE IF NOT EXISTS `pages` ( `description` mediumtext COLLATE latin1_general_ci NOT NULL, PRIMARY KEY (`ID`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci AUTO_INCREMENT=57 ; -<<<<<<< HEAD -INSERT IGNORE INTO `pages` VALUES(37, 'index', 'Home', '0', '/index.php', 1397, 0, 'index', 'ESCan-Electronic tracking system for E-Week. In order to win prizes, attend events, and compete in competitions, you must register your UCInetID with a wristband.'); -INSERT IGNORE INTO `pages` VALUES(39, 'error', 'Error', '0', '/error.php', 848, 0, 'index', ''); -INSERT IGNORE INTO `pages` VALUES(50, 'scan', 'Scan', '', '/scan.php', 4647, 4, 'scan', ''); -INSERT IGNORE INTO `pages` VALUES(56, 'webmaster', 'Webmaster', '', '/webmaster.php', 16, 8, 'webmaster', ''); -INSERT IGNORE INTO `pages` VALUES(41, 'login', 'Sign In', '0', '/login.php', 1291, 0, 'login', ''); -INSERT IGNORE INTO `pages` VALUES(43, 'Sign Up', 'Sign Up', '0', '/signup.php', 1287, 0, 'Sign Up', ''); -INSERT IGNORE INTO `pages` VALUES(45, 'logout', 'Logout', '0', '/logout.php', 209, 2, '', ''); -INSERT IGNORE INTO `pages` VALUES(44, 'events', 'Events', '0', '/events.php', 1244, 0, 'events', ''); -INSERT IGNORE INTO `pages` VALUES(46, 'iforgot', 'Forgot Password', '0', '/iforgot.php', 285, 0, '', ''); -INSERT IGNORE INTO `pages` VALUES(47, 'recover', 'Recover', '0', '/recover.php', 660, 2, '', ''); -INSERT IGNORE INTO `pages` VALUES(48, 'settings', 'Settings', '0', '/settings.php', 1040, 2, '', ''); -INSERT IGNORE INTO `pages` VALUES(53, 'Register', 'Register', '', '/register.php', 4582, 0, 'register', ''); -INSERT IGNORE INTO `pages` VALUES(49, 'admin', 'Admin', '0', '/admin.php', 3528, 6, 'admin', ''); -INSERT IGNORE INTO `pages` VALUES(52, 'statistics', 'Statistics', '', '/statistics.php', 695, 0, 'statistics', ''); -INSERT IGNORE INTO `pages` VALUES(51, 'graph', 'Statistics', '', '/graph.php', 196, 0, 'statistics', ''); -INSERT IGNORE INTO `pages` VALUES(55, 'instructions', 'Instructions', '', '/instructions.php', 200, 0, 'instructions', ''); -INSERT IGNORE INTO `pages` VALUES(54, 'ucinet', 'Ucinet', '', '/ucinet.php', 39, 8, '', ''); - -======= INSERT IGNORE INTO `pages` VALUES(1, 'index', 'Home', '0', '/index.php', 0, 0, 'index', 'ESCan-Electronic tracking system for E-Week. In order to win prizes, attend events, and compete in competitions, you must register your UCInetID with a wristband.'); INSERT IGNORE INTO `pages` VALUES(2, 'error', 'Error', '0', '/error.php', 0, 0, 'index', ''); INSERT IGNORE INTO `pages` VALUES(3, 'scan', 'Scan', '', '/scan.php', 0, 4, 'Scan', ''); @@ -89,7 +69,6 @@ INSERT IGNORE INTO `pages` VALUES(12, 'register', 'Register', '', '/register.php INSERT IGNORE INTO `pages` VALUES(13, 'admin', 'Admin', '0', '/admin.php', 0, 6, 'admin', ''); INSERT IGNORE INTO `pages` VALUES(14, 'statistics', 'Statistics', '', '/statistics.php', 0, 0, 'Statistics', ''); INSERT IGNORE INTO `pages` VALUES(15, 'instructions', 'Instructions', '', '/instructions.php', 0, 0, 'instructions', ''); ->>>>>>> ESCan-2012 CREATE TABLE IF NOT EXISTS `reset` ( `ucinetid` varchar(8) COLLATE latin1_general_ci NOT NULL, `secret` varchar(32) COLLATE latin1_general_ci NOT NULL, @@ -121,13 +100,7 @@ INSERT IGNORE INTO `tabs` VALUES(5, 'scan', 'Scan', 3, 0); INSERT IGNORE INTO `tabs` VALUES(6, 'statistics', 'Statistics', 0, 0); INSERT IGNORE INTO `tabs` VALUES(7, 'admin', 'Admin', 6, 0); INSERT IGNORE INTO `tabs` VALUES(11, 'instructions', 'Instructions', 0, 0); -<<<<<<< HEAD -INSERT IGNORE INTO `tabs` VALUES(12, 'webMaster', 'Webmaster', 8, 0); - - -======= INSERT IGNORE INTO `tabs` VALUES(12, 'webmaster', 'Webmaster', 8, 0); ->>>>>>> ESCan-2012 CREATE TABLE IF NOT EXISTS `users` ( `ucinetid` varchar(8) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL, `barcode` varchar(32) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL COMMENT 'barcode id', @@ -142,4 +115,4 @@ CREATE TABLE IF NOT EXISTS `users` ( `time` time NOT NULL, `volunteer` varchar(8) NOT NULL, PRIMARY KEY (`ucinetid`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 \ No newline at end of file +) ENGINE=MyISAM DEFAULT CHARSET=latin1