| commit | 095048125318814f2c0c36cf49942b7b90879f67 | [log] [tgz] |
|---|---|---|
| author | Nabin Hait <nabinhait@gmail.com> | Tue Jun 15 20:18:06 2021 +0530 |
| committer | Nabin Hait <nabinhait@gmail.com> | Tue Jun 15 20:18:06 2021 +0530 |
| tree | 6f8d78b8be112b9d904a40a6bbf118db9f2abef6 | |
| parent | 80077d215fa9754e8401cf5ff3207a5da5c8424a [diff] [blame] | |
| parent | a97556fa8d7a0d4c55e045de4d7f30a5277cdf9b [diff] [blame] |
fix: merge conflict
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index c820d23..e7fa354 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs
@@ -10,3 +10,6 @@ # Replace use of Class.extend with native JS class 1fe891b287a1b3f225d29ee3d07e7b1824aba9e7 + +# This commit just changes spaces to tabs for indentation in some files +5f473611bd6ed57703716244a054d3fb5ba9cd23