Commit fa7d6c0
committed
Fix conflict resolution during rebase
1 parent 4f2ea3f commit fa7d6c0
File tree
1 file changed
+0
-1
lines changed- clang-tools-extra/clang-tidy/modernize
1 file changed
+0
-1
lines changedLines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
113 | | - | |
114 | 113 | | |
115 | 114 | | |
116 | 115 | | |
| |||
0 commit comments