commit after resolving conflict
authorHamed <hamed.gorjiara@gmail.com>
Tue, 20 Jun 2017 01:22:29 +0000 (18:22 -0700)
committerHamed <hamed.gorjiara@gmail.com>
Tue, 20 Jun 2017 01:22:29 +0000 (18:22 -0700)
1  2 
src/Encoders/naiveelementencoder.c

@@@ -3,7 -3,8 +3,8 @@@
  #include "element.h"
  #include "set.h"
  #include "common.h"
 -#include "struct.h"
 +#include "structs.h"
+ #include <strings.h>
  
  void baseBinaryIndexElementAssign(ElementEncoding *This) {
        Element * element=This->element;