Remove sscan_dims

include/blc_text.h

@@ -192,10 +192,6 @@ void fscan_tsv_floats(FILE *file, float *values, int values_nb);
 
 int fprint_fourcc(FILE *file, uint32_t value);
 char* sprint_fourcc(char *string, uint32_t value);
-<<<<<<< HEAD
-=======
-int blc_sscan_dims(int **lengths, char const *str);
->>>>>>> 4d5fce55b5bb1f55ace1ae2f41d347daf5323f38
 
 END_EXTERN_C
 ///@}

src/blc_array.cpp

@@ -68,15 +68,12 @@ void blc_array::def_array(uint32_t type, uint32_t format, int dims_nb, blc_dim *
      size =dims[dims_nb-1].length*dims[dims_nb-1].step;
 }
 
-<<<<<<< HEAD
 void blc_array::def_array(uint32_t type, uint32_t format, char const *dims_string){
     this->type=type;
     this->format=format;
     sscan_dims(dims_string);
 }
 
-=======
->>>>>>> 4d5fce55b5bb1f55ace1ae2f41d347daf5323f38
 void blc_array::destroy(){
     FREE(data);
     FREE(dims);