Fix merge of test

Author: Aleksandr Parfenov

src/test/regress/expected/tsdicts.out

@@ -679,7 +679,6 @@ SELECT to_tsvector('thesaurus_tst', 'Booking tickets is looking like a booking a
  'card':3,10 'invit':2,9 'like':6 'look':5 'order':1,8
 (1 row)
 
-<<<<<<< HEAD
 ALTER TEXT SEARCH CONFIGURATION thesaurus_tst ALTER MAPPING FOR asciiword WITH english_stem UNION simple;
 SELECT to_tsvector('thesaurus_tst', 'The Mysterious Rings of Supernova 1987A');
                                      to_tsvector                                      

src/test/regress/sql/tsdicts.sql

@@ -240,7 +240,6 @@ SELECT to_tsvector('thesaurus_tst', 'one postgres one two one two three one');
 SELECT to_tsvector('thesaurus_tst', 'Supernovae star is very new star and usually called supernovae (abbreviation SN)');
 SELECT to_tsvector('thesaurus_tst', 'Booking tickets is looking like a booking a tickets');
 
-<<<<<<< HEAD
 ALTER TEXT SEARCH CONFIGURATION thesaurus_tst ALTER MAPPING FOR asciiword WITH english_stem UNION simple;
 SELECT to_tsvector('thesaurus_tst', 'The Mysterious Rings of Supernova 1987A');