# Pastebin exwDpubI
swati@swati-HP-Pavilion-15-Notebook-PC:~/digikam-software-compilation$ git pull
Auto-merging README
CONFLICT (add/add): Merge conflict in README
Auto-merging NEWS
CONFLICT (add/add): Merge conflict in NEWS
Auto-merging CMakeLists.txt
CONFLICT (add/add): Merge conflict in CMakeLists.txt
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Automatic merge failed; fix conflicts and then commit the result.