From 40fc3f182d0272d03a9c118e100abe635b234799 Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Fri, 13 Sep 2019 11:19:13 -0400 Subject: [PATCH] . --- config/deprecatedFiles.lst | 1 - 1 file changed, 1 deletion(-) diff --git a/config/deprecatedFiles.lst b/config/deprecatedFiles.lst index 0934bd347..e3cf34aa4 100644 --- a/config/deprecatedFiles.lst +++ b/config/deprecatedFiles.lst @@ -121,6 +121,5 @@ workflow/engine/xmlform/outputdocs/outputdocs_List.xml workflow/engine/xmlform/cases/cases_ReassignBy.xml workflow/engine/xmlform/users/users_List.xml workflow/engine/xmlform/users/users_Options.xml ->>>>>>> develop workflow/public_html/skins/JSForms.js workflow/public_html/skins/ajax.js