svn commit: r821004 - in /websites/staging/loggingtest/trunk/content: ./ index.html

[bu...@apache.org]

Author: buildbot
Date: Sat Jun  9 19:16:31 2012
New Revision: 821004

Log:
Staging update by buildbot for loggingtest

Modified:
    websites/staging/loggingtest/trunk/content/   (props changed)
    websites/staging/loggingtest/trunk/content/index.html

Propchange: websites/staging/loggingtest/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jun  9 19:16:31 2012
@@ -1 +1 @@
-1348453
+1348487

Modified: websites/staging/loggingtest/trunk/content/index.html
==============================================================================
--- websites/staging/loggingtest/trunk/content/index.html (original)
+++ websites/staging/loggingtest/trunk/content/index.html Sat Jun  9 19:16:31 2012
@@ -104,8 +104,16 @@
 
 <div class="row">
 	<div class="span4">
+<<<<<<< .mine
 		<h2>Apache log4j 2 <span class="label label-warning" style="vertical-align: top;">Beta</span></h2>
+		<p>Log4j 2 is an upgrade to Log4j that provides significant improvements over its predecessor, Log4j 1.x.</p>
+||||||| .r1348283
+		<h2>Apache log4j 2 <span class="label label-warning" style="vertical-align: top;">Beta</span></h2>
+		<p>Log4j 2 is an upgrade to Log4j that provides significant improvements over its predecessor, Log4j 1.x. </p>
+=======
+		<h2>Apache log4j 2 <span class="label label-warning" style="vertical-align: top;">Alpha</span></h2>
 		<p>Log4j 2 is an upgrade to Log4j that provides significant improvements over its predecessor, Log4j 1.x. </p>
+>>>>>>> .r1348485
 		<p><a target="_blank" class="btn" href="log4j/2.x/">Project site &raquo;</a></p>
 	</div>
 	<div class="span4">