# HG changeset patch
# User blanchet
# Date 1266923686 -3600
# Node ID 956d08ec5d6569df3c30260a4c1f8b18cb92e11e
# Parent  99cd1f96b4006625498cb880eec7ce04f84fb86a# Parent  73806dbabe90f04b3fc40e4c47478caf51021e1c
merge

diff -r 99cd1f96b400 -r 956d08ec5d65 src/HOL/NSA/Hyperreal.thy
--- a/src/HOL/NSA/Hyperreal.thy	Tue Feb 23 12:14:29 2010 +0100
+++ b/src/HOL/NSA/Hyperreal.thy	Tue Feb 23 12:14:46 2010 +0100
@@ -7,7 +7,7 @@
 *)
 
 theory Hyperreal
-imports Ln Deriv Taylor Integration HLog
+imports Ln Deriv Taylor HLog
 begin
 
 end