From 4cf52812f78d980a5236bb721d6630de64cce4d2 Mon Sep 17 00:00:00 2001
From: Henrik Rusche <h.rusche@wikki-gmbh.de>
Date: Tue, 3 Dec 2013 17:50:45 +0100
Subject: [PATCH] BUGFIX: Merge error

---
 .../multiphase/interDyMFoam/ras/damBreakWithObstacle/Allclean  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allclean b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allclean
index 3526d5a5f..3c17c3b34 100755
--- 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