From 64b212c4a0cede68d383279b5c78585f7614f3ec Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Fri, 24 Apr 2015 13:36:59 +1000
Subject: [PATCH] Resolved a conflict that was missed during 'git merge'
 conflict resolution.

---
 drive.c | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/drive.c b/drive.c
index f0554a96..4f6f5118 100644
--- a/drive.c
+++ b/drive.c
@@ -39,7 +39,6 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
-#include <math.h>
 #include "fortify.h"
 #include "sics.h"
 #include "drive.h"
@@ -302,11 +301,7 @@ int DriveWrapper(SConnection * pCon, SicsInterp * pSics, void *pData,
     return 0;
   }
 
-<<<<<<< HEAD
-  /* interpret arguments as pairs (name, value) and check */
-=======
-  /* interprete arguments as pairs name value and try to start */
->>>>>>> master
+  /* interpret arguments as pairs (name, value) and try to start */
   for (i = 1; i < argc; i += 2) {
     if (argv[i + 1] == NULL) {
       snprintf(pBueffel, 511, "ERROR: no value found for driving %s", argv[i]);
@@ -316,25 +311,7 @@ int DriveWrapper(SConnection * pCon, SicsInterp * pSics, void *pData,
     iRet = Tcl_GetDouble(tcl_interp, argv[i + 1], &dTarget);
     if (iRet == TCL_ERROR) {
       SCWrite(pCon, Tcl_GetStringResult(tcl_interp), eError);
-<<<<<<< HEAD
-      SetStatus(eOld);
-      return 0;
-    } else if (!isfinite(dTarget)) {
-      snprintf(pBueffel, 511,
-              "ERROR: target %s value for %s is not a finite number",
-              argv[i + 1], argv[i]);
-      SCWrite(pCon, pBueffel, eError);
-      return 0;
-    }
-  }
-  /* interpret arguments as pairs (name, value) and try to start */
-  for (i = 1; i < argc; i += 2) {
-    iRet = Tcl_GetDouble(tcl_interp, argv[i + 1], &dTarget);
-    if (iRet == TCL_ERROR) {
-      SCWrite(pCon, Tcl_GetStringResult(tcl_interp), eError);
-=======
       StopExe(GetExecutor(), "ALL");
->>>>>>> master
       return 0;
     }
     iRet = Start2Run(pCon, pSics, argv[i], RUNDRIVE, dTarget);
@@ -377,11 +354,7 @@ int DriveWrapper(SConnection * pCon, SicsInterp * pSics, void *pData,
     ClearExecutor(GetExecutor());
     return 0;
   }
-<<<<<<< HEAD
   SCWrite(pCon, "Driving finished successfully", eValue);
-=======
-  SCWrite(pCon, "Driving finished sucessfully", eValue);
->>>>>>> master
   return 1;
 }
 
@@ -418,11 +391,7 @@ int RunWrapper(SConnection * pCon, SicsInterp * pSics, void *pData,
     return 0;
   }
 
-<<<<<<< HEAD
   /* interpret arguments as pairs name value and try to start */
-=======
-  /* interprete arguments as pairs name value and try to start */
->>>>>>> master
   for (i = 1; i < argc; i += 2) {
     if (argv[i + 1] == NULL) {
       snprintf(pBueffel,511, "ERROR: no value found for driving %s", argv[i]);