Merge branch 'master' of git.martlubbers.net:clean-tests

[clean-tests.git] / stampedShare / test.icl

diff --git a/stampedShare/test.icl b/stampedShare/test.icl
index 04a142c..d9e330e 100644 (file)
--- a/stampedShare/test.icl
+++ b/stampedShare/test.icl
@@ -1,5 +1,20 @@
 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
@@ -17,3 +32,4 @@ t = viewSharedInformation [] sh
 //t = viewSharedInformation [] ticker
 
 ticker = sdsFocus {start={tv_sec=0,tv_nsec=0},interval={Timespec|tv_sec=0,tv_nsec=1000000}} iworldTimespec
+>>>>>>> 49f7dcc4c088dc816398a0c7854d75d7c2628f15