Merge branch 'feature/INC-99999-SomeProj' into develop

lduancap · Mar 9, 2016 · ec147ad · ec147ad
2 parents f354c6e + 12cd54b
commit ec147ad
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+README.md.rej
diff --git a/MyPortalApplication.jws b/MyPortalApplication.jws
@@ -3,6 +3,7 @@
    <hash n="adrs-workspace-properties">
       <value n="adrs-cleanup-mds-repos-dir" v="true"/>
       <value n="adrs-instance-binding" v="DefaultServer"/>
+
    </hash>
    <value n="appTemplateId" v="#WebCenter Portal Framework Application"/>
    <hash n="component-versions">

diff --git a/README.md b/README.md
@@ -3,4 +3,4 @@ This is my test app
 more changes for readme file - commit this in github develop branch
 
 3rd
-4th
+4444444444
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@

		# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
		hs_err_pid*
		README.md.rej
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,4 @@ This is my test app @@
     more changes for readme file - commit this in github develop branch
 rd
-th
+    4444444444