Permalink
Browse files

argh, git rebased myself a mess

  • Loading branch information...
1 parent 40731df commit 319bd0471d517070c1015fa4c584f11992526f4b Jake Donham committed Apr 22, 2010
Showing with 1 addition and 2 deletions.
  1. +1 −2 src/froc/froc.ml
View
@@ -93,15 +93,14 @@ let hash_event t =
| Occurs o -> o.e_id
let next t =
-<<<<<<< HEAD:src/froc/froc.ml
let t', s' = make_event () in
let c = ref no_cancel in
c :=
notify_result_e_cancel t
(fun r ->
cancel !c;
c := no_cancel;
- send_result s r;
+ send_result s' r;
(* XXX future deps are still added; would be better to become Never *)
Dlist.clear (occurs_of_event_sender s').e_deps);
t'

0 comments on commit 319bd04

Please sign in to comment.