summaryrefslogtreecommitdiff
path: root/2.3-1/src/c/string/disp/ddispa.c
diff options
context:
space:
mode:
authorBrijeshcr2017-07-08 20:18:17 +0530
committerGitHub2017-07-08 20:18:17 +0530
commit39874e472e540ca1bb923b97b52900e1d60439cc (patch)
treee0f47fecb8b5d5e63491c7440d9ecc3072e5cd05 /2.3-1/src/c/string/disp/ddispa.c
parent3adebb16388c6712f7d9c268b91849d164e696df (diff)
downloadScilab2C-39874e472e540ca1bb923b97b52900e1d60439cc.tar.gz
Scilab2C-39874e472e540ca1bb923b97b52900e1d60439cc.tar.bz2
Scilab2C-39874e472e540ca1bb923b97b52900e1d60439cc.zip
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to '2.3-1/src/c/string/disp/ddispa.c')
-rw-r--r--2.3-1/src/c/string/disp/ddispa.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/2.3-1/src/c/string/disp/ddispa.c b/2.3-1/src/c/string/disp/ddispa.c
index 3ae1d15a..29aaceeb 100644
--- a/2.3-1/src/c/string/disp/ddispa.c
+++ b/2.3-1/src/c/string/disp/ddispa.c
@@ -16,11 +16,7 @@ double ddispa (double* in, int rows, int columns){
int i = 0,j = 0;
for (i = 0; i < rows; ++i) {
-<<<<<<< HEAD
for (j=0;j<columns;j++) printf (" %e ", in[i+j*rows]);
-=======
- for (j=0;j<columns;j++) printf (" %1.20f ", in[i+j*rows]);
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
printf("\n");
}
return 0;