Ignore:
Timestamp:
10/14/2017 10:29:03 AM (9 years ago)
Author:
jtorres
Message:

back to workingFEPSim, conflict errors

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/FEPSimulator/nbproject/private/private.xml

    r114 r115  
    88    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2"> 
    99        <group> 
    10             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/network.h</file> 
     10            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.cpp</file> 
     11            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/Main.cpp</file> 
    1112            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/NetworkReader.cpp</file> 
    1213            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/DataPacker.cpp</file> 
    13             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.cpp</file> 
    14             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/Main.cpp</file> 
    1514            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/fep.h</file> 
    16             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.h</file> 
    1715        </group> 
    1816    </open-files> 
Note: See TracChangeset for help on using the changeset viewer.