Forgot autosave isn't on in editor, this commit actually fixes the conflict in generator.h.

Author: hsorby

src/api/libcellml/generator.h

@@ -16,10 +16,7 @@ limitations under the License.
 
 #pragma once
 
-<<<<<<< HEAD
-=======
 #include "libcellml/generatorprofile.h"
->>>>>>> main
 #include "libcellml/logger.h"
 
 namespace libcellml {