# Conflicts: # appsmith-server/pom.xml # appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java # appsmith-server/src/main/java/com/appsmith/server/repositories/BaseRepositoryImpl.java # appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionServiceImpl.java # appsmith-server/src/test/java/com/appsmith/server/services/OrganizationServiceTest.java |
||
|---|---|---|
| .. | ||
| opa | ||
| public | ||
| application-docker.properties | ||
| application-local.properties | ||
| application-staging.properties | ||
| application.properties | ||
| sentry.properties | ||