docs/users_guide/glasgow_exts.rst: fix merge conflict
authorSergei Trofimovich <siarheit@google.com>
Mon, 2 May 2016 10:24:23 +0000 (11:24 +0100)
committerSergei Trofimovich <siarheit@google.com>
Mon, 2 May 2016 10:29:35 +0000 (11:29 +0100)
commitc5be5e2e9e2679318a84447c0443f04c98b60371
tree9666c25e681572ab414a9e7d81aac46f84e710fa
parent81d8a23ee7c0897d4ab2848ec2a990a8cdf9c66b
docs/users_guide/glasgow_exts.rst: fix merge conflict

Signed-off-by: Sergei Trofimovich <siarheit@google.com>
docs/users_guide/glasgow_exts.rst