#Demo Project README this is a simple text file #LICENSE ##Apache 2.0 #Heading 2 Just some file Something awesome happend something nice happend something bad happend *.log <<<<<<< HEAD I hope this isn't much of a problem!
just some updates, on a branch This is bound to cause trouble!! *.log *.orig Just something going