X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=stampedShare%2Ftest.icl;fp=stampedShare%2Ftest.icl;h=0000000000000000000000000000000000000000;hb=4b62b5d397d86147e393c05b3083af74a3a0c4af;hp=d9e330e063351866d940165d5bed75f5aed9001a;hpb=e5305ee9d4290e1aa803a2e62a14f32e5cd29782;p=clean-tests.git

diff --git a/stampedShare/test.icl b/stampedShare/test.icl
deleted file mode 100644
index d9e330e..0000000
--- a/stampedShare/test.icl
+++ /dev/null
@@ -1,35 +0,0 @@
-module test
-
-<<<<<<< HEAD
-import iTasks.Extensions.DateTime
-import System.Time
-import iTasks
-
-sh = sharedStore "bork1" ({DateTime|year=0,mon=0,day=0,hour=0,min=0,sec=0}, 42)
-sh` = sharedStore "bork2" ({Timespec|tv_sec=0,tv_nsec=0}, 42)
-
-Start w = doTasks t w
-
-t     =  viewSharedInformation [] sh
-	-&&- updateSharedInformation [] (dateTimeStampedShare sh)
-	-&&- viewSharedInformation [] sh`
-	-&&- updateSharedInformation [] (timespecStampedShare sh`)
-=======
-import iTasks.Internal.IWorld
-import System.Time
-import iTasks
-
-sh = sharedStore "bork2" ({Timespec|tv_sec=0,tv_nsec=0}, 42)
-
-Start w = doTasks t w
-
-t = viewSharedInformation [] sh
-	-&&- updateSharedInformation [] (
-			  sdsTranslate "" (\p->((), p))
-			(sdsStamp sh ticker (\x y->(x, y))))
-
-// This gives you 100% cpu because you get updates very fast
-//t = viewSharedInformation [] ticker
-
-ticker = sdsFocus {start={tv_sec=0,tv_nsec=0},interval={Timespec|tv_sec=0,tv_nsec=1000000}} iworldTimespec
->>>>>>> 49f7dcc4c088dc816398a0c7854d75d7c2628f15