Merge pull request #1506 from Ralph-Wang/develop

add newline at the end of file for each gitignore
2024-12-23 09:04:26 +00:00 · 2015-08-19 17:58:29 +08:00 · 2015-08-19 17:58:29 +08:00 · de6850b429
commit de6850b429
parent 03b85b73af feed2b61ee
8 changed files with 8 additions and 8 deletions
--- a/conf/gitignore/Android
+++ b/conf/gitignore/Android
@ -20,4 +20,4 @@ build/
 local.properties

 # Proguard folder generated by Eclipse
-proguard/
+proguard/
--- a/conf/gitignore/C
+++ b/conf/gitignore/C
@ -15,4 +15,4 @@
 # Executables
 *.exe
 *.out
-*.app
+*.app
--- a/conf/gitignore/C
+++ b/conf/gitignore/C
@ -105,4 +105,4 @@ Generated_Code #added for RIA/Silverlight projects
 # Visual Studio version. Backup files are not needed, because we have git ;-)
 _UpgradeReport_Files/
 Backup*/
-UpgradeLog*.XML
+UpgradeLog*.XML
--- a/conf/gitignore/Google
+++ b/conf/gitignore/Google
@ -19,4 +19,4 @@ _cgo_export.*

 _testmain.go

-*.exe
+*.exe
--- a/conf/gitignore/Java
+++ b/conf/gitignore/Java
@ -9,4 +9,4 @@
 *.ear

 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+hs_err_pid*
--- a/conf/gitignore/Objective-C
+++ b/conf/gitignore/Objective-C
@ -4,4 +4,4 @@
 # you should judge for yourself, the pros and cons are mentioned at:
 # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control?
 #
-# Pods/
+# Pods/
--- a/conf/gitignore/Python
+++ b/conf/gitignore/Python
@ -33,4 +33,4 @@ nosetests.xml
 # Mr Developer
 .mr.developer.cfg
 .project
-.pydevproject
+.pydevproject
--- a/conf/gitignore/Ruby
+++ b/conf/gitignore/Ruby
@ -15,4 +15,4 @@ tmp
 # YARD artifacts
 .yardoc
 _yardoc
-doc/
+doc/