summaryrefslogtreecommitdiff
path: root/src/c/string
diff options
context:
space:
mode:
authorBrijeshcr2017-07-08 20:18:17 +0530
committerGitHub2017-07-08 20:18:17 +0530
commitbd03b38be0918837e147e969c6bb2014900009db (patch)
tree2cd9b7b1c15092e1367ed15e81aa71ccc9e05190 /src/c/string
parent97d1c6847a05bdb93557553a6bdcfd0f15feda99 (diff)
downloadscilab2c-bd03b38be0918837e147e969c6bb2014900009db.tar.gz
scilab2c-bd03b38be0918837e147e969c6bb2014900009db.tar.bz2
scilab2c-bd03b38be0918837e147e969c6bb2014900009db.zip
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to 'src/c/string')
-rw-r--r--src/c/string/disp/ddispa.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/c/string/disp/ddispa.c b/src/c/string/disp/ddispa.c
index 3ae1d15a..29aaceeb 100644
--- a/src/c/string/disp/ddispa.c
+++ b/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;