summaryrefslogtreecommitdiffstats
path: root/src/test/ui/generic-associated-types/issue-91139.migrate.stderr
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/ui/generic-associated-types/issue-91139.migrate.stderr')
-rw-r--r--src/test/ui/generic-associated-types/issue-91139.migrate.stderr8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/test/ui/generic-associated-types/issue-91139.migrate.stderr b/src/test/ui/generic-associated-types/issue-91139.migrate.stderr
deleted file mode 100644
index 690160577..000000000
--- a/src/test/ui/generic-associated-types/issue-91139.migrate.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: expected identifier, found `<<`
- --> $DIR/issue-91139.rs:1:1
- |
-LL | <<<<<<< HEAD
- | ^^ expected identifier
-
-error: aborting due to previous error
-