dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix installer after merge

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10345 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-11-21 13:22:23 +00:00
parent c1e4594a22
commit a27ac5f6ed
2 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/sql/db_settings_extends.sql
-2
View File
@@ -1119,7 +1119,6 @@ INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `del
(4, 85, 0, 0, 0, 0),
(4, 86, 0, 0, 0, 0),
(4, 87, 0, 0, 0, 0),
<<<<<<< .working
(4, 88, 0, 0, 0, 0),
(4, 89, 0, 0, 0, 0),
(4, 90, 0, 0, 0, 0),
@@ -1237,7 +1236,6 @@ INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `del
(5, 105, 0, 0, 0, 0),
(5, 106, 0, 0, 0, 0),
(4, 88, 1, 1, 1, 1);
>>>>>>> .merge-right.r10309
INSERT INTO `PREFIX_module_access` (`id_profile`, `id_module`, `configure`, `view`) (SELECT 2, id_module, 0, 1 FROM PREFIX_module);
INSERT INTO `PREFIX_module_access` (`id_profile`, `id_module`, `configure`, `view`) (SELECT 3, id_module, 0, 1 FROM PREFIX_module);