wip

1 files changed, 3 insertions, 3 deletions

diff --git a/fluid/proj/mergeback.h b/fluid/proj/mergeback.h
index 04a9dc902..c1e877d60 100644
--- a/fluid/proj/mergeback.h
+++ b/fluid/proj/mergeback.h
@@ -22,7 +22,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
-namespace fld { class Project; }
+class Project;
 
 /** Class that implements the MergeBack functionality.
  \see merge_back(const char *s, int task)
@@ -50,7 +50,7 @@ public:
   enum Feedback { QUIET = 0, CHATTY = 1 };
 protected:
   /// Apply mergeback for this project.
-  fld::Project &proj_;
+  Project &proj_;
   /// Pointer to the C++ code file.
   FILE *code;
   /// Current line number in the C++ code file.
@@ -80,7 +80,7 @@ protected:
   static bool read_tag(const char *tag, Tag *prev_type, uint16_t *uid, uint32_t *crc);
 
 public:
-  Mergeback(fld::Project &proj);
+  Mergeback(Project &proj);
   ~Mergeback();
   int merge_back(const char *s, const char *p, Task task);
   int ask_user_to_merge(const char *s, const char *p);