From 3de2cba4d5706c741a5f445cb2e33608d1043248 Mon Sep 17 00:00:00 2001
From: Peter Sewell
Date: Sun, 23 Nov 2014 12:27:39 +0000
Subject: resolve little conflict

---
 src/lem_interp/interp_interface.lem | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src')

diff --git a/src/lem_interp/interp_interface.lem b/src/lem_interp/interp_interface.lem
index 7c5b295e..26f5f508 100644
--- a/src/lem_interp/interp_interface.lem
+++ b/src/lem_interp/interp_interface.lem
@@ -453,10 +453,6 @@ val integer_address_of_int_list : list int -> integer
 let integer_address_of_int_list (is: list int) = failwith "TODO"
 (* regarding is as a list of bytes in memory, lowest-address first, convert to an integer *)
 
-val integer_of_byte_list : list byte -> integer 
-(* TODO *)let integer_of_byte_list (a:list byte):integer = failwith "TODO"
-val byte_list_of_integer : int -> integer -> list byte 
-(* TODO *)let byte_list_of_integer (len:int) (a:integer):list byte = failwith "TODO"
 
 let bit_to_bool = function
   | Bitc_zero -> false
-- 
cgit v1.2.3