# Conflicts: # app/models/form.server.model.js # package-lock.json # package.json # public/modules/forms/admin/views/admin-form.client.view.html # public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html
# Conflicts: # app/models/form.server.model.js # package-lock.json # package.json # public/modules/forms/admin/views/admin-form.client.view.html # public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html