Remove missed conflict

4ian · Oct 12, 2023 · 548b6bf · 548b6bf
1 parent f5fed4c
commit 548b6bf
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/Core/GDCore/Project/ObjectsContainer.cpp b/Core/GDCore/Project/ObjectsContainer.cpp
@@ -72,13 +72,7 @@ bool ObjectsContainer::HasObjectNamed(const gd::String& name) const {
 gd::Object& ObjectsContainer::GetObject(const gd::String& name) {
   return *(*find_if(initialObjects.begin(),
                     initialObjects.end(),
-<<<<<<< HEAD
                     [&](const std::unique_ptr<gd::Object>& object) { return object->GetName() == name; }));
-=======
-                    [&name](std::unique_ptr<gd::Object>& object) {
-                      return object->GetName() == name;
-                    }));
->>>>>>> Remove former way to find object where possible
 }
 const gd::Object& ObjectsContainer::GetObject(const gd::String& name) const {
   return *(*find_if(initialObjects.begin(),