fix conflict in sum files (c2378774) · Commits · verimag / synchrone / lustre-v6 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

lustre-v6
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

c2378774

Commit c2378774 authored 9 years ago by Mamadou Ndiaye

Downloads
- Plain Diff

fix conflict in sum files

parents 52226f33 3a9024f7

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/ast2lic.ml 2 additions, 2 deletions

src/ast2lic.ml
src/evalClock.ml 10 additions, 8 deletions

src/evalClock.ml
test/lus2lic.sum 7 additions, 22 deletions

test/lus2lic.sum
test/lus2lic.time 7 additions, 7 deletions

test/lus2lic.time
test/should_fail/semantics/arity.lus 9 additions, 0 deletions

test/should_fail/semantics/arity.lus
test/should_work/poussoir.lus 5 additions, 9 deletions

test/should_work/poussoir.lus
test/site.exp 5 additions, 1 deletion

test/site.exp

with 45 additions and 49 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment