BUGFIX: Merge error

2013-12-03 17:50:45 +01:00 · 2013-12-03 17:50:45 +01:00 · 4cf52812f7
commit 4cf52812f7
parent 2a8db930ad
1 changed files with 0 additions and 3 deletions
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allclean
@ -4,10 +4,7 @@
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

 rm -rf 0 > /dev/null 2>&1
-<<<<<<< HEAD
-=======
 rm -rf constant/setSubset > /dev/null 2>&1
->>>>>>> 3d822b2a7c2d40a5f1b828ca33762a1e3eaad27d

 cleanCase