diff options
Diffstat (limited to 'src/c/matrixOperations/cat/zcata.c')
| -rw-r--r-- | src/c/matrixOperations/cat/zcata.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/c/matrixOperations/cat/zcata.c b/src/c/matrixOperations/cat/zcata.c index 659f14c..485553d 100644 --- a/src/c/matrixOperations/cat/zcata.c +++ b/src/c/matrixOperations/cat/zcata.c @@ -26,11 +26,7 @@ void zrowcata(doubleComplex *in1, int lines1, int columns1, doubleComplex *in2, { for (j = 0 ; j < lines1 ; ++j) { -<<<<<<< HEAD out[i*(lines1 + lines2) + j] = in1[i*lines1 + j]; -======= - /*out[i*(lines1 + lines2) + j] = in1[i*lines1 + j];*/ ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 } for (j = 0 ; j < lines2 ; ++j) { |