Fixed the conflicts and updating the repo history

kinshuk4 · kinshuk4 · commit 449e09ad926a · 2017-06-02T19:55:42.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,18 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+*.DS_Store
+
 ########################## Java,Android ###############################
 # built application files for android
 *.apk
@@ -22,6 +37,10 @@ local.properties
 /bin/
 /target/
 
+#.classpath
+.settings
+JavaRestSamples/play_intro
+
 # Proguard folder generated by Eclipse
 proguard/
 
@@ -30,6 +49,7 @@ proguard/
 *.ipr
 *.iws
 /.idea/
+.idea/
 
 # Mac files
 .DS_Store
@@ -233,7 +253,6 @@ fabric.properties
 
 
 .idea/vcs.xml
-=======
 # Windows image file caches
 Thumbs.db
 ehthumbs.db
@@ -253,12 +272,11 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
-# =========================
+
 # Operating System Files
-# =========================
 
 # OSX
-# =========================
+
 
 .DS_Store
 .AppleDouble
@@ -281,3 +299,4 @@ $RECYCLE.BIN/
 Network Trash Folder
 Temporary Items
 .apdisk
+*-Ex.R
