remove analysis

Author: vdbma

test/SelfGravity/ShearingSheet/analysis.cpp

@@ -1,18 +1,9 @@
 #include "idefix.hpp"
 #include "setup.hpp"
-<<<<<<< HEAD
-=======
-#include "analysis.hpp"
->>>>>>> 4b686185 (Fixed IDIR index shift)
 
 static real gammaIdeal;
 static real omega;
 static real shear;
-<<<<<<< HEAD
-=======
-Analysis *analysis;
-
->>>>>>> 4b686185 (Fixed IDIR index shift)
 
 //#define STRATIFIED
 
@@ -106,12 +97,3 @@ void Setup::InitFlow(DataBlock &data) {
     // Send it all, if needed
     d.SyncToDevice();
 }
-<<<<<<< HEAD
-=======
-
-
-// Analyse data to produce an output
-
-void MakeAnalysis(DataBlock & data) {
-}
->>>>>>> 4b686185 (Fixed IDIR index shift)