From a4fa7ef2b90880623499e86324b7b40626a02f9d Mon Sep 17 00:00:00 2001
From: Alexander Regueiro <alexreg@me.com>
Date: Sat, 29 Dec 2018 05:45:45 +0000
Subject: [PATCH] Fixed stderr files for ui tests.

---
 src/test/ui/error-codes/E0110.rs                          | 3 +--
 src/test/ui/error-codes/E0110.stderr                      | 8 --------
 .../rfc1598-generic-associated-types/collections.stderr   | 4 ++--
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/test/ui/error-codes/E0110.rs b/src/test/ui/error-codes/E0110.rs
index 2de5da16ad76a..764b62b8dfecf 100644
--- a/src/test/ui/error-codes/E0110.rs
+++ b/src/test/ui/error-codes/E0110.rs
@@ -1,4 +1,3 @@
 type X = u32<'static>; //~ ERROR E0110
 
-fn main() {
-}
+fn main() {}
diff --git a/src/test/ui/error-codes/E0110.stderr b/src/test/ui/error-codes/E0110.stderr
index be9b4229aeb60..a644ac92cefbf 100644
--- a/src/test/ui/error-codes/E0110.stderr
+++ b/src/test/ui/error-codes/E0110.stderr
@@ -1,13 +1,5 @@
-<<<<<<< HEAD
 error[E0110]: lifetime arguments are not allowed on this entity
   --> $DIR/E0110.rs:1:14
-||||||| merged common ancestors
-error[E0110]: lifetime parameters are not allowed on this type
-  --> $DIR/E0110.rs:11:14
-=======
-error[E0110]: lifetime arguments are not allowed on this entity
-  --> $DIR/E0110.rs:11:14
->>>>>>> Added regression test for using generic parameters on modules.
    |
 LL | type X = u32<'static>; //~ ERROR E0110
    |              ^^^^^^^ lifetime argument not allowed
diff --git a/src/test/ui/rfc1598-generic-associated-types/collections.stderr b/src/test/ui/rfc1598-generic-associated-types/collections.stderr
index b3fb81b418e8c..eeed04bd89213 100644
--- a/src/test/ui/rfc1598-generic-associated-types/collections.stderr
+++ b/src/test/ui/rfc1598-generic-associated-types/collections.stderr
@@ -22,13 +22,13 @@ error[E0109]: type arguments are not allowed on this entity
 LL |         <<Self as Collection<T>>::Family as CollectionFamily>::Member<U>;
    |                                                                       ^ type argument not allowed
 
-error[E0109]: type arguments are not allowed on this entity
+error[E0110]: lifetime arguments are not allowed on this entity
   --> $DIR/collections.rs:24:50
    |
 LL |     fn iterate<'iter>(&'iter self) -> Self::Iter<'iter>;
    |                                                  ^^^^^ lifetime argument not allowed
 
-error[E0109]: type arguments are not allowed on this entity
+error[E0110]: lifetime arguments are not allowed on this entity
   --> $DIR/collections.rs:50:50
    |
 LL |     fn iterate<'iter>(&'iter self) -> Self::Iter<'iter> {