docs/users_guide/glasgow_exts.rst: fix merge conflict
docs/users_guide/glasgow_exts.rst: fix merge conflict

Signed-off-by: Sergei Trofimovich <df7d2cee2e7ececeb2368216a0f9d0537fd32149@google.com>

olsner/ghc,vikraman/ghc,snoyberg/ghc,sdiehl/ghc,snoyberg/ghc,olsner/ghc,ezyang/ghc,shlevy/ghc,snoyberg/ghc,sdiehl/ghc,vikraman/ghc,olsner/ghc,vikraman/ghc,snoyberg/ghc,vTurbine/ghc,sgillespie/ghc,vTurbine/ghc,snoyberg/ghc,vTurbine/ghc,sgillespie/ghc,ezyang/ghc,snoyberg/ghc,mettekou/ghc,shlevy/ghc,shlevy/ghc,sgillespie/ghc,mettekou/ghc,sdiehl/ghc,vikraman/ghc,shlevy/ghc,olsner/ghc,shlevy/ghc,mettekou/ghc,vikraman/ghc,ezyang/ghc,mettekou/ghc,sgillespie/ghc,olsner/ghc,ezyang/ghc,sdiehl/ghc,ezyang/ghc,vTurbine/ghc,sgillespie/ghc,shlevy/ghc,vTurbine/ghc,ezyang/ghc,olsner/ghc,vTurbine/ghc,sdiehl/ghc,sgillespie/ghc,sgillespie/ghc,sdiehl/ghc,mettekou/ghc,mettekou/ghc,ezyang/ghc,vTurbine/ghc,vikraman/ghc,snoyberg/ghc,sdiehl/ghc,olsner/ghc,mettekou/ghc,shlevy/ghc,vikraman/ghc