Changeset 613 for branches/devel/Cbc/src


Ignore:
Timestamp:
May 15, 2007 6:27:56 AM (12 years ago)
Author:
forrest
Message:

conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/src/CbcSolver.cpp

    r612 r613  
    13021302#ifdef COIN_HAS_ASL
    13031303    CoinModel * coinModel = NULL;
    1304 <<<<<<< .mine
    13051304    CglStored storedAmpl;
    1306 =======
    1307 >>>>>>> .r611
    13081305    ampl_info info;
    13091306    CoinModel saveCoinModel;
Note: See TracChangeset for help on using the changeset viewer.