diff options
Diffstat (limited to '2.3-1/src/c/CACSD/includes/lqr.h')
| -rw-r--r-- | 2.3-1/src/c/CACSD/includes/lqr.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/2.3-1/src/c/CACSD/includes/lqr.h b/2.3-1/src/c/CACSD/includes/lqr.h index aab06d33..5b20ee83 100644 --- a/2.3-1/src/c/CACSD/includes/lqr.h +++ b/2.3-1/src/c/CACSD/includes/lqr.h @@ -17,11 +17,7 @@ extern "C" { #endif -<<<<<<< HEAD void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, double* S, double* X, double* K); -======= -void dlqra(double* sys, int sys_rows, int sys_cols, double* X, double* K); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifdef __cplusplus } /* extern "C" */ |