httpd-infra-a mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cor...@apache.org
Subject [2/2] infrastructure-test git commit: Merge branch 'test_1'
Date Tue, 03 Nov 2015 18:28:18 GMT
Merge branch 'test_1'

Conflicts:
	README.md


Project: http://git-wip-us.apache.org/repos/asf/infrastructure-test/repo
Commit: http://git-wip-us.apache.org/repos/asf/infrastructure-test/commit/54b5c164
Tree: http://git-wip-us.apache.org/repos/asf/infrastructure-test/tree/54b5c164
Diff: http://git-wip-us.apache.org/repos/asf/infrastructure-test/diff/54b5c164

Branch: refs/heads/master
Commit: 54b5c1643f15d4d1f0f90f596bd4aa4688ffe93a
Parents: 6a88632 d82806f
Author: Geoffrey Corey <coreyg@apache.org>
Authored: Tue Nov 3 10:28:05 2015 -0800
Committer: Geoffrey Corey <coreyg@apache.org>
Committed: Tue Nov 3 10:28:05 2015 -0800

----------------------------------------------------------------------
 README.md | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/infrastructure-test/blob/54b5c164/README.md
----------------------------------------------------------------------
diff --cc README.md
index 0637e6d,8cf7571..668e454
--- a/README.md
+++ b/README.md
@@@ -1,13 -1,7 +1,15 @@@
  ds;lfjdsaflk;jfds
  
 +sdf
 +
 +
  dsfdsfds
  
 +
 +sdfjdsa;lkfjads;flkjdsaf
  jdsflkjdsf;lkjdsa
  
 +DIVERGE!:wq
 +
+ MORE DIVERGENCE!!!!
++


Mime
View raw message