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 17:14:02 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/ca460843
Tree: http://git-wip-us.apache.org/repos/asf/infrastructure-test/tree/ca460843
Diff: http://git-wip-us.apache.org/repos/asf/infrastructure-test/diff/ca460843

Branch: refs/heads/master
Commit: ca4608432a6370c6ea71beae8baf6ffd6b342d41
Parents: 1beeedc b21dcc6
Author: Geoffrey Corey <coreyg@apache.org>
Authored: Tue Nov 3 09:13:52 2015 -0800
Committer: Geoffrey Corey <coreyg@apache.org>
Committed: Tue Nov 3 09:13:52 2015 -0800

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


http://git-wip-us.apache.org/repos/asf/infrastructure-test/blob/ca460843/README.md
----------------------------------------------------------------------
diff --cc README.md
index 98b09f3,ad7ff1c..db94499
--- a/README.md
+++ b/README.md
@@@ -1,9 -1,5 +1,10 @@@
  ds;lfjdsaflk;jfds
  
 +sdf
 +
 +
  dsfdsfds
  
 +
 +sdfjdsa;lkfjads;flkjdsaf
+ jdsflkjdsf;lkjdsa


Mime
View raw message