Solved conflicts

jfnavarro · Mar 4, 2020 · 320559d · 320559d
1 parent 19d8777
commit 320559d
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/data/STData.cpp b/src/data/STData.cpp
@@ -690,4 +690,3 @@ void STData::is3D(bool is3D)
 {
     m_is3D = is3D;
 }
->>>>>>> 3D