Unbreak build (fallout from 067f1e4f20e)
authorAustin Seipp <austin@well-typed.com>
Fri, 21 Nov 2014 06:23:40 +0000 (00:23 -0600)
committerAustin Seipp <austin@well-typed.com>
Fri, 21 Nov 2014 06:23:40 +0000 (00:23 -0600)
Signed-off-by: Austin Seipp <austin@well-typed.com>
docs/users_guide/7.10.1-notes.xml

index 4b82329..40a5ac0 100644 (file)
              </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>
                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
                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>