Post-merge fix: put back UTF-8 text that kdiff3 destroyed

1b79437c · Sergei Petrunia · 70af9cf5 · 1b79437c
Commit 1b79437c authored Oct 07, 2017 by Sergei Petrunia
Hide whitespace changes
Inline Side-by-side

Showing with 3179 additions and 3177 deletions

sql/share/errmsg-utf8.txt sql/share/errmsg-utf8.txt +3179 -3177

No files found.
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt