Merge branch 'master' into multi-objective-lra

src/storm/storage/jani/EdgeContainer.cpp

@@ -71,8 +71,9 @@ namespace storm {
         
         EdgeContainer& EdgeContainer::operator=(EdgeContainer const& other) {
             EdgeContainer otherCpy(other);
-            this->templates = std::move(other.templates);
-            this->edges = std::move(other.edges);
+            this->templates = std::move(otherCpy.templates);
+            this->edges = std::move(otherCpy.edges);
+            return *this;
         }
 
         void EdgeContainer::finalize(Model const& containingModel) {