Skip to content

Commit b0da58e

Browse files
author
Paolo Tranquilli
committed
Rust: fix forgotten merge conflict
1 parent 7fbaca0 commit b0da58e

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

rust/ql/integration-tests/hello-project/summary.expected

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,8 @@
99
| Inconsistencies - Path resolution | 0 |
1010
| Inconsistencies - SSA | 0 |
1111
| Inconsistencies - data flow | 0 |
12-
<<<<<<< HEAD
13-
| Lines of code extracted | 6 |
14-
| Lines of user code extracted | 6 |
15-
=======
16-
| Lines of code extracted | 24 |
12+
| Lines of code extracted | 7 |
1713
| Lines of user code extracted | 7 |
18-
>>>>>>> c76d50da3be (Rust: show unexpanded macro)
1914
| Macro calls - resolved | 2 |
2015
| Macro calls - total | 3 |
2116
| Macro calls - unresolved | 1 |

0 commit comments

Comments
 (0)