diff --git a/src/data/STData.cpp b/src/data/STData.cpp
index 09d1c8c..794b4e4 100644
--- a/src/data/STData.cpp
+++ b/src/data/STData.cpp
@@ -690,4 +690,3 @@ void STData::is3D(bool is3D)
 {
     m_is3D = is3D;
 }
->>>>>>> 3D