From de86d1dc97756d58b7a8851aafa64ddc485e4be5 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 18 Jun 2008 11:31:27 +0100
Subject: [PATCH] update to reflect RASmodel changes

---
 src/postProcessing/forces/Make/options | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/postProcessing/forces/Make/options b/src/postProcessing/forces/Make/options
index 5b24de2bbd..9e2407c605 100644
--- 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 \