conflits

Author: vdbma

test/SelfGravity/ShearingSheet/setup.cpp

@@ -64,7 +64,7 @@ Setup::Setup(Input &input, Grid &grid, DataBlock &data, Output &output) {
 void Setup::InitFlow(DataBlock &data) {
     // Create a host copy
     DataBlockHost d(data);
-    real x,y,z;
+    real x,y,z = 0;
 
     real cs2 = gammaIdeal*omega*omega;