From a35521b52c63906166a5bc271463a678dcfc2e01 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Mon, 12 May 2014 16:52:40 +0100
Subject: [PATCH] bad merge

---
 H/eval.h | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/H/eval.h b/H/eval.h
index 1499b4a16..7a41e37d0 100644
--- a/H/eval.h
+++ b/H/eval.h
@@ -202,7 +202,6 @@ typedef enum {
    * Note that the number of bits of an integer is at least the size in bits of a Prolog term cell.
    */
   op_unot,
-<<<<<<< HEAD
   /** exp( _X_ ), natural exponentiation of _X_ .
    * 
    *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
@@ -218,31 +217,6 @@ typedef enum {
    *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    *
    */
-=======
-  /** exp( _X_ ) [ISO]
-   *
-   * Natural exponential.
-   *
-   *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
-   *   ?- _X = 2.3, exp(_X) =:= e ** _X.
-   *   true.
-   *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   *
-   * 	Notice that comparing whether two floating-point numbers are equal may lead to incorrect results.
-   */
-  op_exp,
-  /** log( _X_ ) [ISO]
-	*
-    * Natural logarithm.
-    *
-    *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
-    *    ?- _X = 2.3, log(exp(_X)) =:= exp(log(_X)).
-    *    true.
-    *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    *
-    * 	Notice that comparing whether two floating-point numbers are equal may lead to incorrect results.
-    */
->>>>>>> 410efd577cd12f75b1b8c2e3676658ac725a4789
   op_log,
   /** log10( _X_ ) [ISO]
 	*