# Pastebin Ir8ONa8M
Unmerged paths:
  (use "git add <file>..." to mark resolution)

        both added:      .gitignore
        both added:      CMakeLists.txt
        both added:      NEWS
        both added:      README