diff options
| author | doufenghu <[email protected]> | 2019-03-12 13:50:53 +0800 |
|---|---|---|
| committer | doufenghu <[email protected]> | 2019-03-12 13:50:53 +0800 |
| commit | 5900b299ea660abd8b79a0553938d725418064b6 (patch) | |
| tree | f8e3300a4d99da07e34d4c24536abaf6f7436b8c /.idea/sqldialects.xml | |
| parent | 2858a6c47c048b9a6f2b7c03f84946e193b69963 (diff) | |
| parent | 536e5b887a206908ae2edeb093f564ba2dc1362d (diff) | |
# Conflicts:
# src/main/java/com/nis/util/JedisUtils.java
# src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java
# src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
# src/main/resources/nis.properties
合并配置全量同步功能，解决如上冲突
Diffstat (limited to '.idea/sqldialects.xml')
| -rw-r--r-- | .idea/sqldialects.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml deleted file mode 100644 index d576a09..0000000 --- a/.idea/sqldialects.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="SqlDialectMappings"> - <file url="file://$PROJECT_DIR$/db/galaxy_user_mysql.sql" dialect="MySQL" /> - <file url="file://$PROJECT_DIR$/db/init/galaxy_stru_mysql.sql" dialect="MySQL" /> - <file url="file://$PROJECT_DIR$/db/test/galaxy_test_mysql.sql" dialect="MySQL" /> - </component> -</project>
\ No newline at end of file |