Module: ppl/ppl Branch: products Commit: 8760df47483200e17daf43df3c7ca4ec7aad9185 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8760df4748320...

Author: Patricia Hill p.m.hill@leeds.ac.uk Date: Mon Mar 15 11:18:15 2010 +0000

Conflicts resolved.

---

src/Partially_Reduced_Product.templates.hh | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/src/Partially_Reduced_Product.templates.hh b/src/Partially_Reduced_Product.templates.hh index 0626970..174a57d 100644 --- a/src/Partially_Reduced_Product.templates.hh +++ b/src/Partially_Reduced_Product.templates.hh @@ -254,10 +254,7 @@ Partially_Reduced_Product<D1, D2, R>

if (is_empty()) return false; -<<<<<<< HEAD:src/Partially_Reduced_Product.templates.hh -======= PPL_ASSERT(reduced); ->>>>>>> master:src/Partially_Reduced_Product.templates.hh

PPL_DIRTY_TEMP_COEFFICIENT(inf1_n); PPL_DIRTY_TEMP_COEFFICIENT(inf1_d); @@ -310,10 +307,7 @@ Partially_Reduced_Product<D1, D2, R>

if (is_empty()) return false; -<<<<<<< HEAD:src/Partially_Reduced_Product.templates.hh -======= PPL_ASSERT(reduced); ->>>>>>> master:src/Partially_Reduced_Product.templates.hh

PPL_DIRTY_TEMP_COEFFICIENT(sup1_n); PPL_DIRTY_TEMP_COEFFICIENT(sup1_d); @@ -372,10 +366,7 @@ Partially_Reduced_Product<D1, D2, R>

if (is_empty()) return false; -<<<<<<< HEAD:src/Partially_Reduced_Product.templates.hh -======= PPL_ASSERT(reduced); ->>>>>>> master:src/Partially_Reduced_Product.templates.hh

PPL_DIRTY_TEMP_COEFFICIENT(inf1_n); PPL_DIRTY_TEMP_COEFFICIENT(inf1_d);