diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 63119d85..38cc9180 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -5,6 +5,7 @@ eebbc6a384a051ecbc3bba74f93f1bb390eb092b 31e7ad71e085965c05cdb9898d0869b78ca84140 <<<<<<< HEAD +<<<<<<< HEAD 6ccf0d857c3fec72f88a047cf0e1df0b98c99a55 be2e5d5d0e04779ca2f7229d2e2f793b241a27b8 ======= @@ -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)