Remove merge HEAD>>>>> stuff

hjabird · Jan 23, 2019 · f604f36 · f604f36
1 parent 8ed29d2
commit f604f36
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/example/bench_gaussian.c b/example/bench_gaussian.c
@@ -12,11 +12,7 @@
 
 int main(int argc, char* argv[])
 {
-<<<<<<< HEAD
 	double factor = sqrt(2.), ms_correction = 1000. / (double)CLOCKS_PER_SEC;
-=======
-	double factor = sqrt(2.);
->>>>>>> 6177bccbffac77218d9ccb40c27c72d4b16709ef
 	long testsize = 8, this_testsize, repeats = 3, i, power;
 	clock_t s, e, tvel, tdvort, tvdvort;
 	tvel = 99999999;