Skip to content

Instantly share code, notes, and snippets.

@jmettraux

jmettraux/gist:1230678

Created September 20, 2011 23:01
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save jmettraux/1230678 to your computer and use it in GitHub Desktop.
Save jmettraux/1230678 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
# works fine
foreach concurrence ... task: y
end
# conflict
concurrence
foreach concurrence ... task: x
end
foreach concurrence ... task: y
end
end
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment