Rust: Accept changes to expected files

Author: paldepind

rust/ql/test/library-tests/dataflow/models/CONSISTENCY/PathResolutionConsistency.expected

@@ -5,8 +5,8 @@ multipleCallTargets
 | dereference.rs:184:17:184:30 | ... .foo() |
 | dereference.rs:186:17:186:25 | S.bar(...) |
 | dereference.rs:187:17:187:29 | S.bar(...) |
-| main.rs:589:9:589:14 | S4.m() |
 | main.rs:590:9:590:18 | ...::m(...) |
+<<<<<<< HEAD
 | main.rs:591:9:591:20 | ... .m() |
 | main.rs:592:9:592:24 | ...::m(...) |
 | main.rs:2553:13:2553:31 | ...::from(...) |
@@ -15,3 +15,11 @@ multipleCallTargets
 | main.rs:2561:13:2561:31 | ...::from(...) |
 | main.rs:2562:13:2562:31 | ...::from(...) |
 | main.rs:2563:13:2563:31 | ...::from(...) |
+=======
+| main.rs:2524:13:2524:31 | ...::from(...) |
+| main.rs:2525:13:2525:31 | ...::from(...) |
+| main.rs:2526:13:2526:31 | ...::from(...) |
+| main.rs:2532:13:2532:31 | ...::from(...) |
+| main.rs:2533:13:2533:31 | ...::from(...) |
+| main.rs:2534:13:2534:31 | ...::from(...) |
+>>>>>>> 6184952f00e (Rust: Accept changes to expected files)