After resolving conflicts

[satune.git] / src / Serialize / deserializer.h

diff --git a/src/Serialize/deserializer.h b/src/Serialize/deserializer.h
index 057346d4cbca9652d34118f708e52c24d227cf79..6335c897c42270ba115a8dc87b5f57f67e4e1b8a 100644 (file)
--- a/src/Serialize/deserializer.h
+++ b/src/Serialize/deserializer.h
@@ -1,5 +1,5 @@
 
-/* 
+/*
  * File:   deserializer.h
  * Author: hamed
  *
@@ -14,12 +14,12 @@
 /**
  * Style of serialized file:
  * ASTNodeType#Pointer#ObjectDATA
- * 
+ *
  * @param file
  */
 class Deserializer {
 public:
-       Deserializer(const char* file);
+       Deserializer(const char *file);
        CSolver *deserialize();
        virtual ~Deserializer();
 private:
@@ -44,5 +44,5 @@ private:
        CloneMap map;
 };
 
-#endif /* DESERIALIZER_H */
+#endif/* DESERIALIZER_H */