Complete merge resolving process to keep the project up-to-date and merge conflict free
No related branches found
No related tags found
Showing
- .gitignore 2 additions, 1 deletion.gitignore
- .liquibase/Data_alias/basic/2020.2.0/Districts/alter_districtResponsibleDatatypes.xml 13 additions, 0 deletions...2020.2.0/Districts/alter_districtResponsibleDatatypes.xml
- .liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml 2 additions, 0 deletions.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
- .liquibase/Data_alias/basic/2020.2.0/Districts/insert_KeywordsAdviserRoles.xml 61 additions, 0 deletions.../basic/2020.2.0/Districts/insert_KeywordsAdviserRoles.xml
- .liquibase/Data_alias/basic/2020.2.0/changelog.xml 1 addition, 1 deletion.liquibase/Data_alias/basic/2020.2.0/changelog.xml
- aliasDefinition/Data_alias/Data_alias.aod 60 additions, 4 deletionsaliasDefinition/Data_alias/Data_alias.aod
- entity/Attribute_entity/Attribute_entity.aod 0 additions, 6 deletionsentity/Attribute_entity/Attribute_entity.aod
- entity/DistrictResponsible_entity/DistrictResponsible_entity.aod 98 additions, 52 deletions...DistrictResponsible_entity/DistrictResponsible_entity.aod
- entity/DistrictResponsible_entity/contentTitleProcess.js 2 additions, 3 deletionsentity/DistrictResponsible_entity/contentTitleProcess.js
- entity/DistrictResponsible_entity/entityfields/adviser_role/displayValueProcess.js 6 additions, 0 deletions...e_entity/entityfields/adviser_role/displayValueProcess.js
- entity/DistrictResponsible_entity/entityfields/adviser_status/displayValueProcess.js 6 additions, 0 deletions...entity/entityfields/adviser_status/displayValueProcess.js
- entity/DistrictResponsible_entity/entityfields/adviser_status/valueProcess.js 7 additions, 0 deletions...nsible_entity/entityfields/adviser_status/valueProcess.js
- entity/DistrictResponsible_entity/entityfields/adviserroles/children/containername_param/valueProcess.js 5 additions, 0 deletions...adviserroles/children/containername_param/valueProcess.js
- entity/DistrictResponsible_entity/entityfields/adviserstates/children/containername_param/valueProcess.js 5 additions, 0 deletions...dviserstates/children/containername_param/valueProcess.js
- entity/DistrictResponsible_entity/entityfields/department_attribute_id/valueProcess.js 0 additions, 12 deletions...tity/entityfields/department_attribute_id/valueProcess.js
- entity/DistrictResponsible_entity/entityfields/departmentattributename/documentation.adoc 0 additions, 1 deletion...y/entityfields/departmentattributename/documentation.adoc
- entity/DistrictResponsible_entity/entityfields/departmentattributename/stateProcess.js 0 additions, 9 deletions...tity/entityfields/departmentattributename/stateProcess.js
- entity/DistrictResponsible_entity/entityfields/departmentattributename/valueProcess.js 0 additions, 15 deletions...tity/entityfields/departmentattributename/valueProcess.js
- entity/DistrictResponsible_entity/entityfields/departments/children/parentid_param/valueProcess.js 0 additions, 4 deletions...ields/departments/children/parentid_param/valueProcess.js
- entity/DistrictResponsible_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js 8 additions, 0 deletions...persons/children/excludedcontactids_param/valueProcess.js
Loading
Please register or sign in to comment