Something went wrong on our end
-
David Büchler authored
# Conflicts: # .liquibase/Data_alias/basic/2019.2/changelog.xml # aliasDefinition/Data_alias/Data_alias.aod # entity/Employee_entity/Employee_entity.aod # language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod # language/_____LANGUAGE_de/_____LANGUAGE_de.aod # language/_____LANGUAGE_en/_____LANGUAGE_en.aod # preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
David Büchler authored# Conflicts: # .liquibase/Data_alias/basic/2019.2/changelog.xml # aliasDefinition/Data_alias/Data_alias.aod # entity/Employee_entity/Employee_entity.aod # language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod # language/_____LANGUAGE_de/_____LANGUAGE_de.aod # language/_____LANGUAGE_en/_____LANGUAGE_en.aod # preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod