[commit: ghc] master: docs/users_guide/glasgow_exts.rst: fix merge conflict (c5be5e2)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c5be5e2e9e2679318a84447c0443f04c98b60371/ghc

>---------------------------------------------------------------

commit c5be5e2e9e2679318a84447c0443f04c98b60371
Author: Sergei Trofimovich <siarheit at google.com>
Date:   Mon May 2 11:24:23 2016 +0100

    docs/users_guide/glasgow_exts.rst: fix merge conflict
    
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>


>---------------------------------------------------------------

c5be5e2e9e2679318a84447c0443f04c98b60371
 docs/users_guide/glasgow_exts.rst | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index deffd01..863c054 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -4556,7 +4556,14 @@ Constrained class method types
 
 .. ghc-flag:: -XConstrainedClassMethods
 
-@ -4562,7 +4562,20 @@ class type variable, thus: ::
+    Allows the definition of further constraints on individual class methods.
+
+Haskell 98 prohibits class method types to mention constraints on the
+class type variable, thus: ::
+
+      class Seq s a where
+        fromList :: [a] -> s a
+        elem     :: Eq a => a -> s a -> Bool
 
 The type of ``elem`` is illegal in Haskell 98, because it contains the
 constraint ``Eq a``, which constrains only the class type variable (in