update to reflect RASmodel changes

de86d1dc · Andrew Heather · graham · 81983e95 · de86d1dc
Commit de86d1dc authored 16 years ago by Andrew Heather Committed by graham 16 years ago
--- a/src/postProcessing/forces/Make/options
+++ b/src/postProcessing/forces/Make/options
@@ -12,7 +12,11 @@ LIB_LIBS = \
    -lfiniteVolume \
    -lmeshTools \
    -lincompressibleTransportModels \
+<<<<<<< HEAD:src/postProcessing/forces/Make/options
    -lincompressibleRASModels \
+=======
+    -lincompressibleRASmodels \
+>>>>>>> update to reflect RASmodel changes:src/postProcessing/forces/Make/options
    -lincompressibleLESmodels \
    -lbasicThermophysicalModels \
    -lspecie \