Skip to content
Snippets Groups Projects
Commit e8d5945e authored by Miniontoby's avatar Miniontoby ✍🏻
Browse files

Fixed some extra stuff because MERGE

parent ac05bf71
No related branches found
No related tags found
No related merge requests found
......@@ -87,7 +87,6 @@ ALTER TABLE `permissions` ADD PRIMARY KEY (`perm_id`), ADD KEY `perm_mod` (`perm
ALTER TABLE `permissions` MODIFY `perm_id` int(11) NOT NULL AUTO_INCREMENT;
INSERT INTO `permissions` (`perm_id`, `perm_mod`, `perm_desc`) VALUES
<<<<<<< HEAD
(1, 'SCH', 'Access schools'),
(2, 'SCH', 'Create new schools'),
(3, 'SCH', 'Update schools'),
......@@ -103,24 +102,6 @@ INSERT INTO `permissions` (`perm_id`, `perm_mod`, `perm_desc`) VALUES
(13, 'HMWRK', 'Update homework'),
(14, 'HMWRK', 'Delete homework'),
(15, 'STDNT', 'See homework');
=======
(1, 'SCH', 'Access schools'),
(2, 'SCH', 'Create new schools'),
(3, 'SCH', 'Update schools'),
(4, 'SCH', 'Delete schools'),
(5, 'USR', 'Access users'),
(6, 'USR', 'Create new users'),
(7, 'USR', 'Update users'),
(8, 'USR', 'Delete users'),
(9, 'ROSTER', 'Create new roster'),
(10, 'ROSTER', 'Update roster'),
(11, 'ROSTER', 'Delete roster'),
(12, 'HMWRK', 'Create new homework'),
(13, 'HMEWRK', 'Update homework'),
(14, 'HMEWRK', 'Delete homework'),
(15, 'STDNT', 'See homework');
>>>>>>> 70cf2ad1a63cd3135ca5065ac0cc569a19485e42
--
-- Tabelstructuur voor tabel `roles_permissions`
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment