Resolving Conflicts ... Still there're errors that should be fixed

[satune.git] / src / Encoders / encodings.c

diff --git a/src/Encoders/encodings.c b/src/Encoders/encodings.c
index f86389d924e8a0e1d56bb5ac5aef3de18814b551..27d393eeb441e33e9b4e9b493365f6b6fbfc1c47 100644 (file)
--- a/src/Encoders/encodings.c
+++ b/src/Encoders/encodings.c
@@ -4,7 +4,7 @@
 #include "element.h"
 #include "common.h"
 #include "boolean.h"
-#include "naiveelementencoder.h"
+#include "naiveencoder.h"
 
 Encodings* allocEncodings(){
        Encodings* This = (Encodings*) ourmalloc(sizeof(Encodings));