Filename: /var/www///arsu/.git/COMMIT_EDITMSG

fix conflicts

./Ninja\.