There was an error fetching the commit references. Please try again later.
merging master changes to shiva_demo_branch
# Conflicts: # .idea/.gitignore # .idea/compiler.xml # .idea/gradle.xml
Showing
- .gradle/buildOutputCleanup/buildOutputCleanup.lock 0 additions, 0 deletions.gradle/buildOutputCleanup/buildOutputCleanup.lock
- .gradle/buildOutputCleanup/cache.properties 2 additions, 2 deletions.gradle/buildOutputCleanup/cache.properties
- .gradle/buildOutputCleanup/outputFiles.bin 0 additions, 0 deletions.gradle/buildOutputCleanup/outputFiles.bin
- .gradle/checksums/checksums.lock 0 additions, 0 deletions.gradle/checksums/checksums.lock
- .gradle/checksums/md5-checksums.bin 0 additions, 0 deletions.gradle/checksums/md5-checksums.bin
- .gradle/checksums/sha1-checksums.bin 0 additions, 0 deletions.gradle/checksums/sha1-checksums.bin
- .idea/.gitignore 1 addition, 1 deletion.idea/.gitignore
- .idea/compiler.xml 1 addition, 10 deletions.idea/compiler.xml
- .idea/gradle.xml 0 additions, 1 deletion.idea/gradle.xml
- build/libs/demo-project-git-operations-0.0.1-SNAPSHOT.jar 0 additions, 0 deletionsbuild/libs/demo-project-git-operations-0.0.1-SNAPSHOT.jar
- build/reports/tests/test/classes/com.nisum.epe.demo.DemoApplicationTests.html 34 additions, 34 deletions...test/classes/com.nisum.epe.demo.DemoApplicationTests.html
- build/reports/tests/test/index.html 4 additions, 4 deletionsbuild/reports/tests/test/index.html
- build/reports/tests/test/packages/com.nisum.epe.demo.html 3 additions, 3 deletionsbuild/reports/tests/test/packages/com.nisum.epe.demo.html
- build/test-results/test/TEST-com.nisum.epe.demo.DemoApplicationTests.xml 33 additions, 33 deletions...lts/test/TEST-com.nisum.epe.demo.DemoApplicationTests.xml
- build/test-results/test/binary/output.bin 0 additions, 0 deletionsbuild/test-results/test/binary/output.bin
- build/test-results/test/binary/output.bin.idx 0 additions, 0 deletionsbuild/test-results/test/binary/output.bin.idx
- build/test-results/test/binary/results.bin 0 additions, 0 deletionsbuild/test-results/test/binary/results.bin
- build/tmp/bootJar/MANIFEST.MF 2 additions, 2 deletionsbuild/tmp/bootJar/MANIFEST.MF
- src/main/java/com/nisum/epe/demo/resource/PromotionEngineResource.java 15 additions, 0 deletions.../com/nisum/epe/demo/resource/PromotionEngineResource.java
- src/main/java/com/nisum/epe/demo/srinivas/Employee.java 27 additions, 0 deletionssrc/main/java/com/nisum/epe/demo/srinivas/Employee.java
Please register or sign in to comment