diff options
| author | Carlo Zancanaro <carlo@pc-4w14-0.cs.usyd.edu.au> | 2012-05-28 16:12:34 +1000 |
|---|---|---|
| committer | Carlo Zancanaro <carlo@pc-4w14-0.cs.usyd.edu.au> | 2012-05-28 16:12:34 +1000 |
| commit | 72b70a4ff7dad8185eb2dd652bdd2983b829930a (patch) | |
| tree | d9cd8c92030dfe4c41d5480612dd0f2df74e5ce1 /impl/systems/long-fixpoint | |
| parent | ea05c9c5fa30b8822f618e861d12a09df1f8f017 (diff) | |
| parent | 7c6700343578ad0a2acab48fcb4ef0cbb1a370b9 (diff) | |
Merge branch 'master' of ssh://bitbucket.org/czan/honours
Conflicts:
impl/IdSet.hpp
impl/main.cpp
impl/systems/long-fixpoint
Diffstat (limited to 'impl/systems/long-fixpoint')
| -rw-r--r-- | impl/systems/long-fixpoint | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/impl/systems/long-fixpoint b/impl/systems/long-fixpoint index 5838910..f56b700 100644 --- a/impl/systems/long-fixpoint +++ b/impl/systems/long-fixpoint @@ -98,6 +98,7 @@ x96 = x95 x97 = x96 x98 = x97 x99 = x98 +<<<<<<< HEAD x100 = x99 x101 = x100 x102 = x101 |