Removed missed merge conflict marker.

modsim/ass3/main.c

@@ -35,7 +35,6 @@ int main(int argc, char **argv) {
         case 0:
             y0[0] = 10.0;
             y0[1] = 20.0;
-<<<<<<< HEAD
             logger_open("report/osc_euler");
             puts("Integrating Euler method...");
             INTEGRATE(Euler, .0, 100.0, COMPARE_DT, 2, osc);
@@ -45,17 +44,6 @@ int main(int argc, char **argv) {
             INTEGRATE(RungeKutta2, .0, 100.0, COMPARE_DT, 2, osc);
             logger_close();
             logger_open("report/osc_rk4");
-=======
-            logfile = fopen("osc_euler.data", "w");
-            puts("Integrating Euler method...");
-            INTEGRATE(Euler, .0, 100.0, COMPARE_DT, 2, osc);
-            logger_close();
-            logfile = fopen("osc_rk2.data", "w");
-            puts("Integrating Runge-Kutta 2 method...");
-            INTEGRATE(RungeKutta2, .0, 100.0, COMPARE_DT, 2, osc);
-            logger_close();
-            logfile = fopen("osc_rk4.data", "w");
->>>>>>> 6034874266b42027b60f69f6ee27e8add52cd8be
             puts("Integrating Runge-Kutta 4 method...");
             INTEGRATE(RungeKutta4, .0, 100.0, COMPARE_DT, 2, osc);
         break;