Issue #000 fix: merge remote-tracking branch 'origin/master' into rel…

…ease-1.6 # Conflicts: # metadata.sh
Sunbird-Lern · Apr 10, 2018 · 26d8048 · 26d8048
2 parents a45fd98 + 0f14a2c
commit 26d8048
Show file tree

Hide file tree

Showing 81 changed files with 4,017 additions and 1,555 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,9 @@ tmp
 dist
 /.idea
 /*.iml
+*.iml
+*.log
+RUNNING_PID
 /out
 /.idea_modules
 /.classpath

diff --git a/metadata.sh b/metadata.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 # return version
-echo '{"name":"learner_service","version":"0.0.6","org":"sunbird","hubuser":"purplesunbird"}'
+echo '{"name":"learner_service","version":"1.5.0","org":"sunbird","hubuser":"purplesunbird"}'
diff --git a/pom.xml b/pom.xml
@@ -7,6 +7,6 @@
   <name>sunbird_lms_service</name>
   <modules>
       <module>service/libs</module>
-		  <module>service</module>
+      <module>service</module>
   </modules>
-</project>
+</project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,9 @@ tmp @@
     dist
     /.idea
     /*.iml
+    *.iml
+    *.log
+    RUNNING_PID
     /out
     /.idea_modules
     /.classpath
@@ Expand Down @@