[commit: ghc] master: Unbreak build (fallout from 067f1e4f20e) (27f9c74)

[git at git.haskell.org]

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

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

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

commit 27f9c74630da7ace758c357e6421cc35cb5bebfc
Author: Austin Seipp <austin at well-typed.com>
Date:   Fri Nov 21 00:23:40 2014 -0600

    Unbreak build (fallout from 067f1e4f20e)
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


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

27f9c74630da7ace758c357e6421cc35cb5bebfc
 docs/users_guide/7.10.1-notes.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/users_guide/7.10.1-notes.xml b/docs/users_guide/7.10.1-notes.xml
index 4b82329..40a5ac0 100644
--- a/docs/users_guide/7.10.1-notes.xml
+++ b/docs/users_guide/7.10.1-notes.xml
@@ -127,7 +127,6 @@
              </para>
            </listitem>
            <listitem>
-<<<<<<< HEAD
                 <para>
                     Many more options have learned to respect the <option>-ddump-to-file</option>.
                     For example you can use <option>-ddump-to-file</option> with <option>-ddump-splices</option>
@@ -144,7 +143,9 @@
                solver, to add new functionality to GHC's
                typechecker. See <xref linkend="typechecker-plugins"/>
                for more details.
-=======
+             </para>
+           </listitem>
+           <listitem>
              <para>
                A new warning flag, <option>-fwarn-missing-exported-sigs</option>
                has been added. The behavior is similar to
@@ -152,7 +153,6 @@
                flag exported values. This flag takes precedence over
                <option>-fwarn-missing-signatures</option> so it can be used
                in conjunction with <option>-Wall</option>.
->>>>>>> 0551cf1... Add flag `-fwarn-missing-exported-sigs`
              </para>
            </listitem>
        </itemizedlist>