Skip to content

Commit

Permalink
🔧 (.git-blame-ignore-revs): resolve merge conflict by keeping the cor…
Browse files Browse the repository at this point in the history
…rect commit hashes and removing conflict markers
  • Loading branch information
marco76tv committed Jun 26, 2024
1 parent 6294ed6 commit 905c915
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
eebbc6a384a051ecbc3bba74f93f1bb390eb092b
31e7ad71e085965c05cdb9898d0869b78ca84140
<<<<<<< HEAD
<<<<<<< HEAD
6ccf0d857c3fec72f88a047cf0e1df0b98c99a55
be2e5d5d0e04779ca2f7229d2e2f793b241a27b8
=======
Expand All @@ -14,3 +15,6 @@ eebbc6a384a051ecbc3bba74f93f1bb390eb092b
>>>>>>> 411bdbf (Ignore Dusting commit in git blame)
=======
>>>>>>> d8d5269 (Ignore Dusting commit in git blame)
=======
6ccf0d857c3fec72f88a047cf0e1df0b98c99a55
>>>>>>> d9fc513 (Ignore Dusting commit in git blame)

0 comments on commit 905c915

Please sign in to comment.