From 0d01660d9484aa9722428e066ee31eabc6687a77 Mon Sep 17 00:00:00 2001
From: ysc <yang-shangchuan@qq.com>
Date: Thu, 4 Jul 2013 15:11:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=81=BF=E5=85=8D=E6=8F=90=E4=BA=A4SingleMerge?=
 =?UTF-8?q?=E5=92=8CMultiMerge=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E7=9A=84=E5=90=88=E5=B9=B6=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index eb74445b..4d561baf 100644
--- 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