From cbd5d9a36e76433b14904808ca3073f2204d5a42 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Thu, 1 May 1997 20:26:07 +0000 Subject: [PATCH] removed conflict >>>>> --- src/libCom/calc/calcPerform.c | 4 ---- src/libCom/calcPerform.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/libCom/calc/calcPerform.c b/src/libCom/calc/calcPerform.c index 911bdf11a..085831f7f 100644 --- a/src/libCom/calc/calcPerform.c +++ b/src/libCom/calc/calcPerform.c @@ -122,12 +122,8 @@ static double local_random(); #define PI 3.141592654 #endif -<<<<<<< calcPerform.c epicsShareFunc long epicsShareAPI calcPerform(double *parg, double *presult, char *post) -======= -long calcPerform( double *parg, double *presult, char *post) ->>>>>>> 1.23 { double *pstacktop; /* stack of values */ double stack[80]; diff --git a/src/libCom/calcPerform.c b/src/libCom/calcPerform.c index 911bdf11a..085831f7f 100644 --- a/src/libCom/calcPerform.c +++ b/src/libCom/calcPerform.c @@ -122,12 +122,8 @@ static double local_random(); #define PI 3.141592654 #endif -<<<<<<< calcPerform.c epicsShareFunc long epicsShareAPI calcPerform(double *parg, double *presult, char *post) -======= -long calcPerform( double *parg, double *presult, char *post) ->>>>>>> 1.23 { double *pstacktop; /* stack of values */ double stack[80];