You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2012/06/09 21:01:39 UTC
svn commit: r1348486 - /logging/site/branches/cms/trunk/content/index.twig
Author: rgoers
Date: Sat Jun 9 19:01:39 2012
New Revision: 1348486
URL: http://svn.apache.org/viewvc?rev=1348486&view=rev
Log:
Force a build
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=1348486&r1=1348485&r2=1348486&view=diff
==============================================================================
--- logging/site/branches/cms/trunk/content/index.twig (original)
+++ logging/site/branches/cms/trunk/content/index.twig Sat Jun 9 19:01:39 2012
@@ -33,8 +33,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 »</a></p>
</div>
<div class="span4">