logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r1348504 - /logging/site/branches/cms/trunk/content/index.twig
Date Sat, 09 Jun 2012 21:02:53 GMT
Author: rgoers
Date: Sat Jun  9 21:02:53 2012
New Revision: 1348504

URL: http://svn.apache.org/viewvc?rev=1348504&view=rev
Log:
Resolve conflict

Modified:
    logging/site/branches/cms/trunk/content/index.twig

Modified: logging/site/branches/cms/trunk/content/index.twig
URL: http://svn.apache.org/viewvc/logging/site/branches/cms/trunk/content/index.twig?rev=1348504&r1=1348503&r2=1348504&view=diff
==============================================================================
--- logging/site/branches/cms/trunk/content/index.twig (original)
+++ logging/site/branches/cms/trunk/content/index.twig Sat Jun  9 21:02:53 2012
@@ -31,16 +31,8 @@
 
 <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">



Mime
View raw message