svn commit: r901174 - /camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java.orig

[davsclaus]

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