fix merge error

This commit is contained in:
Uwe Steinmann 2017-02-21 06:53:43 +01:00
parent 6b8b099339
commit 08e9f14e9d

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"
--