From 1477bbe177da4d3ad07877d4b672aac4828d0a13 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Mon, 24 Jun 2019 15:49:04 +0200
Subject: Fix rebase conflicts

---
 examples/laminar/cylinder2d/cylinder2d.cpp | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'examples/laminar/cylinder2d')

diff --git a/examples/laminar/cylinder2d/cylinder2d.cpp b/examples/laminar/cylinder2d/cylinder2d.cpp
index bc30461..b7879cb 100644
--- a/examples/laminar/cylinder2d/cylinder2d.cpp
+++ b/examples/laminar/cylinder2d/cylinder2d.cpp
@@ -58,13 +58,8 @@ typedef double T;
 
 
 // Parameters for the simulation setup
-<<<<<<< HEAD:examples/laminar/cylinder2d/cylinder2d.cpp
 const int N = 10;       // resolution of the model
 const T Re = 20.;       // Reynolds number
-=======
-const int N = 20;       // resolution of the model
-const T Re = 100.;       // Reynolds number
->>>>>>> Change F2C restriction, some cleanup:examples/cylinder2d/cylinder2d.cpp
 const T maxPhysT = 16.; // max. simulation time in s, SI unit
 const T L = 0.1/N;      // latticeL
 const T lengthX = 2.2;
-- 
cgit v1.2.3