Merge resolve fix

2026-04-30 07:49:31 -05:00 · 2021-03-19 11:08:37 +01:00
parent 543e3641ab
commit 65c3de6c86
1 changed files with 0 additions and 6 deletions
@@ -19,13 +19,7 @@ namespace openspace {
        glm::vec2 getUpperRightCornerScreenSpace();
        glm::vec2 getLowerLeftCornerScreenSpace();
        bool coordIsInsideCornersScreenSpace(glm::vec2 coord);
-<<<<<<< Updated upstream
        glm::vec2 coordIsOnResizeArea(glm::vec2 coord);
-
-=======
-        bool coordIsOnResizeButton(glm::vec2 coord);
-     
->>>>>>> Stashed changes
        void scale(glm::vec2 scalingFactor);
        glm::mat4 scaleMatrix() override;
        void saveResizeStartSize();