fixed conflicts

1 files changed, 0 insertions, 24 deletions

diff --git a/dpmert/error_surface.h b/dpmert/error_surface.h
deleted file mode 100644
index bb65847b..00000000
--- a/dpmert/error_surface.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _ERROR_SURFACE_H_
-#define _ERROR_SURFACE_H_
-
-#include <vector>
-#include <string>
-
-#include "ns.h"
-
-class Score;
-
-struct ErrorSegment {
-  double x;
-  SufficientStats delta;
-  ErrorSegment() : x(0), delta() {}
-};
-
-class ErrorSurface : public std::vector<ErrorSegment> {
- public:
-  ~ErrorSurface();
-  void Serialize(std::string* out) const;
-  void Deserialize(const std::string& in);
-};
-
-#endif