Definitely a mistake. Those files come from a merge conflict I think for use with 3-way merge.
On 26 November 2015 at 21:49, Ralph Goers <[email protected]> wrote: > Must be from a merge > > Sent from my iPad > > > On Nov 26, 2015, at 6:35 PM, Remko Popma <[email protected]> wrote: > > > > Are these committed by mistake? > > > > > /log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java.orig > > > /log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java.orig > > > /log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java.orig > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > > -- Matt Sicker <[email protected]>
