Hi When I backport to the 2.7 branch these 2 files is changed as well Sending camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java Sending camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java
I think they have some svnmerge property assigned or whatever so they get changed. Anyone know how to resolve this? Or should we just not care? -- Claus Ibsen ----------------- FuseSource Email: cib...@fusesource.com Web: http://fusesource.com Twitter: davsclaus, fusenews Blog: http://davsclaus.blogspot.com/ Author of Camel in Action: http://www.manning.com/ibsen/
