Merge pull request #13 from wuyalun198612/develop

忽略 idea 配置文件
uni7corn · Dec 15, 2017 · 6adf5f3 · 6adf5f3
2 parents 86b78bd + 5845edc
commit 6adf5f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -83,3 +83,4 @@ hs_err_pid*
 .idea/runConfigurations.xml
 
 .idea/vcs.xml
+.idea/vcs.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
Original file line number	Diff line number	Diff line change
Expand Up		@@ -83,3 +83,4 @@ hs_err_pid*
		.idea/runConfigurations.xml

		.idea/vcs.xml
		.idea/vcs.xml