Fixed stderr files for ui tests.

Author: Alexander Regueiro

src/test/ui/error-codes/E0110.rs

@@ -1,4 +1,3 @@
 type X = u32<'static>; //~ ERROR E0110
 
-fn main() {
-}
+fn main() {}

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

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> {