From: Hamed <hamed.gorjiara@gmail.com>
Date: Tue, 20 Jun 2017 01:22:29 +0000 (-0700)
Subject: commit after resolving conflict
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5249fbe7415e60c2e0411c64031d8a60aa7cd09f;p=satune.git

commit after resolving conflict
---

5249fbe7415e60c2e0411c64031d8a60aa7cd09f
diff --cc src/Encoders/naiveelementencoder.c
index 58f63ac,4d52235..bb6e91a
--- a/src/Encoders/naiveelementencoder.c
+++ b/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;