removing multiple diff patches in src/lagrangian/Allwmake...

removing multiple diff patches in src/lagrangian/Allwmake src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H src/postProcessing/forces/Make/options following a rebase

src/lagrangian/Allwmake

@@ -5,13 +5,6 @@ wmake libso basic
 wmake libso solidParticle
 wmake libso intermediate
 wmake libso dieselSpray
-<<<<<<< HEAD:src/lagrangian/Allwmake
-wmake libso molecularDynamics/potential
-wmake libso molecularDynamics/molecule
-
- 
-=======
 (cd molecularDynamics && wmake libso potential)
 (cd molecularDynamics && wmake libso molecule)
 
->>>>>>> small updates and removing X permissions:src/lagrangian/Allwmake

src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H

@@ -57,15 +57,12 @@ class shifted
 
         scalar e_at_rCut_;
 
-<<<<<<< HEAD:src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H
-
-=======
->>>>>>> fixed missing public: in src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H:src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H
 public:
 
     //- Runtime type information
     TypeName("shifted");
 
+
     // Constructors
 
         //- Construct from components

src/postProcessing/forces/Make/options

@@ -12,17 +12,8 @@ LIB_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -lincompressibleTransportModels \
-<<<<<<< HEAD:src/postProcessing/forces/Make/options
-<<<<<<< HEAD:src/postProcessing/forces/Make/options
-    -lincompressibleRASModels \
-=======
-    -lincompressibleRASmodels \
->>>>>>> update to reflect RASmodel changes:src/postProcessing/forces/Make/options
-    -lincompressibleLESmodels \
-=======
     -lincompressibleRASModels \
     -lincompressibleLESModels \
->>>>>>> updated to reflect changes in turbulence models:src/postProcessing/forces/Make/options
     -lbasicThermophysicalModels \
     -lspecie \
     -lcompressibleRASModels \