Return-Path: 
 <commits-return-852-apmail-logging-commits-archive=logging.apache.org@logging.apache.org>
X-Original-To: apmail-logging-commits-archive@minotaur.apache.org
Delivered-To: apmail-logging-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 5CEC1C89E
	for <apmail-logging-commits-archive@minotaur.apache.org>;
 Sat,  9 Jun 2012 21:03:23 +0000 (UTC)
Received: (qmail 46110 invoked by uid 500); 9 Jun 2012 21:03:23 -0000
Delivered-To: apmail-logging-commits-archive@logging.apache.org
Received: (qmail 46087 invoked by uid 500); 9 Jun 2012 21:03:23 -0000
Mailing-List: contact commits-help@logging.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@logging.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@logging.apache.org>
List-Post: <mailto:commits@logging.apache.org>
List-Id: <commits.logging.apache.org>
Reply-To: dev@logging.apache.org
Delivered-To: mailing list commits@logging.apache.org
Received: (qmail 46080 invoked by uid 99); 9 Jun 2012 21:03:23 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Jun 2012 21:03:23 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Jun 2012 21:03:21 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id E7B49238896F
	for <commits@logging.apache.org>; Sat,  9 Jun 2012 21:02:59 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r821016 - in /websites/staging/loggingtest/trunk/content:
 ./
 index.html
Date: Sat, 09 Jun 2012 21:02:59 -0000
To: commits@logging.apache.org
From: buildbot@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120609210259.E7B49238896F@eris.apache.org>

Author: buildbot
Date: Sat Jun  9 21:02:59 2012
New Revision: 821016

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 21:02:59 2012
@@ -1 +1 @@
-1348503
+1348504

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 21:02:59 2012
@@ -102,16 +102,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">