[frappe] chore: remove conflict-marker look-alike

Date: 2023-07-28T11:45:56+05:30
By: Ankush Menat

chore: remove conflict-marker look-alike

This is annoying when trying to find git conflicts

[skip ci]

This is a commit that is not part of a pull request.

---

Checkout instructions

# Checkout locally
git fetch upstream
git switch ft-commit-22a3a56d44a798d30e997c29e9f24e8f55445fc8

# Make changes then rebase
git rebase -i upstream/develop --reapply-cherry-picks

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

added botforktool label

mentioned in commit 766b272e

merged