diff options
Diffstat (limited to '2.3-1/src/c/CACSD/interfaces/int_lqr.h')
| -rw-r--r-- | 2.3-1/src/c/CACSD/interfaces/int_lqr.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/2.3-1/src/c/CACSD/interfaces/int_lqr.h b/2.3-1/src/c/CACSD/interfaces/int_lqr.h index c292f8c1..8deba90b 100644 --- a/2.3-1/src/c/CACSD/interfaces/int_lqr.h +++ b/2.3-1/src/c/CACSD/interfaces/int_lqr.h @@ -16,7 +16,6 @@ extern "C" { #endif -<<<<<<< HEAD #define ss2lqrd2d2(in1,size1,out1,out2) dlqra(in1,size1[0],size1[1],NULL,\ NULL,NULL,out1,out2); @@ -25,9 +24,6 @@ extern "C" { #define ss2d2d2d2lqrd2d2(in1,size1,in2,size2,in3,size3,in4,size4,out1,out2) \ dlqra(in1,size1[0],size1[1],in2,in3,in4,out1,out2); -======= -#define ss2lqrd2d2(in1,size1,out1,out2) dlqra(in1,size1[0],size1[1],out1,out2); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifdef __cplusplus } /* extern "C" */ |