Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 75791 invoked from network); 20 Jan 2010 13:07:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 20 Jan 2010 13:07:25 -0000 Received: (qmail 96169 invoked by uid 500); 20 Jan 2010 13:07:25 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 96119 invoked by uid 500); 20 Jan 2010 13:07:25 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 96109 invoked by uid 99); 20 Jan 2010 13:07:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Jan 2010 13:07:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 20 Jan 2010 13:07:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 42F8323888BD; Wed, 20 Jan 2010 13:07:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r901174 - /camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java.orig Date: Wed, 20 Jan 2010 13:07:04 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100120130704.42F8323888BD@eris.apache.org> Author: davsclaus Date: Wed Jan 20 13:07:03 2010 New Revision: 901174 URL: http://svn.apache.org/viewvc?rev=901174&view=rev Log: Delete merge conflict file Removed: camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java.orig