diff options
Diffstat (limited to '2.3-1/src/c/matrixOperations/cat/ccata.c')
| -rw-r--r-- | 2.3-1/src/c/matrixOperations/cat/ccata.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/2.3-1/src/c/matrixOperations/cat/ccata.c b/2.3-1/src/c/matrixOperations/cat/ccata.c index cd2b4c92..6a2a6d99 100644 --- a/2.3-1/src/c/matrixOperations/cat/ccata.c +++ b/2.3-1/src/c/matrixOperations/cat/ccata.c @@ -26,7 +26,11 @@ void crowcata(floatComplex *in1, int lines1, int columns1, floatComplex *in2, i { 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) { |