From 5bf13da02c03ceee13154f9a8483fd1c3ddb2fe4 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Thu, 1 May 1997 20:30:15 +0000
Subject: [PATCH] fixed conflict >>>>>

---
 src/libCom/calc/postfix.c | 7 -------
 src/libCom/post.h         | 2 +-
 src/libCom/postfix.c      | 7 -------
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/libCom/calc/postfix.c b/src/libCom/calc/postfix.c
index 2714c6b38..e7ed805a8 100644
--- a/src/libCom/calc/postfix.c
+++ b/src/libCom/calc/postfix.c
@@ -303,14 +303,7 @@ register short		*pno_bytes;
  *
  * convert an infix expression to a postfix expression
  */
-<<<<<<< postfix.c
-long epicsShareAPI postfix(
-register char	*pinfix,
-register char	*ppostfix,
-short		*perror)
-=======
 long postfix(char *pinfix,char *ppostfix,short *perror)
->>>>>>> 1.23
 {
 	short		no_bytes;
 	register short	operand_needed;
diff --git a/src/libCom/post.h b/src/libCom/post.h
index 9113a6ed9..17cfa9dc3 100644
--- a/src/libCom/post.h
+++ b/src/libCom/post.h
@@ -119,4 +119,4 @@ epicsShareFunc long epicsShareAPI
 	calcPerform(double *parg, double *presult, char *post);
 
 epicsShareFunc long epicsShareAPI 
-	postfix(register char *pinfix, register char *ppostfix, short *perror);
+	postfix(char *pinfix, char *ppostfix, short *perror);
diff --git a/src/libCom/postfix.c b/src/libCom/postfix.c
index 2714c6b38..e7ed805a8 100644
--- a/src/libCom/postfix.c
+++ b/src/libCom/postfix.c
@@ -303,14 +303,7 @@ register short		*pno_bytes;
  *
  * convert an infix expression to a postfix expression
  */
-<<<<<<< postfix.c
-long epicsShareAPI postfix(
-register char	*pinfix,
-register char	*ppostfix,
-short		*perror)
-=======
 long postfix(char *pinfix,char *ppostfix,short *perror)
->>>>>>> 1.23
 {
 	short		no_bytes;
 	register short	operand_needed;