- Removed merge conflict

8b54a82a · Frank Bergmann · d4997cfb · 8b54a82a
Commit 8b54a82a authored May 07, 2020 by Frank Bergmann
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

upgrade-5.0.3.0.0-5.0.3.0.1.sql sql/postgresql/upgrade/upgrade-5.0.3.0.0-5.0.3.0.1.sql +0 -1

No files found.
--- a/sql/postgresql/upgrade/upgrade-5.0.3.0.0-5.0.3.0.1.sql
+++ b/sql/postgresql/upgrade/upgrade-5.0.3.0.0-5.0.3.0.1.sql
@@ -122,4 +122,3 @@ BEGIN
 END;$body$ language 'plpgsql';
 -- select im_resource_mgmt_work_days(55815, '2020-01-01', '2020-01-31');
 -- select im_resource_mgmt_absence_days(55815, '2020-01-01', '2020-01-31');
-