gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 00:45:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge error

Browse Source
This commit is contained in:
Uwe Steinmann 2017-02-21 06:53:43 +01:00
parent 6b8b099339
commit 08e9f14e9d
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
install/create_tables-postgres.sql
View File

@ -93,8 +93,6 @@ CREATE TABLE "tblUsers" (
-- --------------------------------------------------------
--
<<<<<<< HEAD
=======
-- Table structure for table `tblUserSubstitutes`
--
@ -107,7 +105,6 @@ CREATE TABLE "tblUserSubstitutes" (
-- --------------------------------------------------------
--
>>>>>>> seeddms-6.0.x-postgres
-- Table structure for table "tblUserPasswordRequest"
--