Commit427fe8d

Aleksandr Parfenov

committed

Fix merge of test

1 parent6455df0 commit427fe8dCopy full SHA for 427fe8d

File tree

-2

lines changed

-2

lines changed

Lines changed: 0 additions & 1 deletion

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

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,6 @@ SELECT to_tsvector('thesaurus_tst', 'one postgres one two one two three one');`
`240`	`240`	`SELECT to_tsvector('thesaurus_tst','Supernovae star is very new star and usually called supernovae (abbreviation SN)');`
`241`	`241`	`SELECT to_tsvector('thesaurus_tst','Booking tickets is looking like a booking a tickets');`
`242`	`242`
`243`		`-<<<<<<< HEAD`
`244`	`243`	`ALTERTEXT SEARCH CONFIGURATION thesaurus_tst ALTER MAPPING FOR asciiword WITH english_stemUNION simple;`
`245`	`244`	`SELECT to_tsvector('thesaurus_tst','The Mysterious Rings of Supernova 1987A');`
`246`	`245`

Comments

(0)