避免提交SingleMerge和MultiMerge自动生成的合并文件

xiaochunping · Jul 4, 2013 · 0d01660 · 0d01660
1 parent f1ef9e6
commit 0d01660
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,8 @@ APDPlat_Web/src/main/webapp/DateTime/DateTime_merge.js
 APDPlat_Web/src/main/webapp/js/js_merge.js
 APDPlat_Web/src/main/webapp/platform/css/platform_css_merge.css
 APDPlat_Web/src/main/webapp/platform/js/platform_js_merge.js
+APDPlat_Web/src/main/webapp/css/login_merge.css
+APDPlat_Web/src/main/webapp/js/login_merge.js
 .settings/
 .classpath
 .project