Update DocGenerator.java

Author: kleihan

orchestra2doc/src/main/java/io/fixprotocol/orchestra/docgen/DocGenerator.java

@@ -45,32 +45,6 @@
 import org.stringtemplate.v4.STWriter;
 import org.stringtemplate.v4.misc.STMessage;
 
-<<<<<<< Updated upstream
-import io.fixprotocol._2024.orchestra.repository.ActorType;
-import io.fixprotocol._2024.orchestra.repository.Actors;
-import io.fixprotocol._2024.orchestra.repository.CatComponentTypeT;
-import io.fixprotocol._2024.orchestra.repository.Categories;
-import io.fixprotocol._2024.orchestra.repository.CategoryType;
-import io.fixprotocol._2024.orchestra.repository.CodeSetType;
-import io.fixprotocol._2024.orchestra.repository.CodeType;
-import io.fixprotocol._2024.orchestra.repository.ComponentRefType;
-import io.fixprotocol._2024.orchestra.repository.ComponentType;
-import io.fixprotocol._2024.orchestra.repository.Datatype;
-import io.fixprotocol._2024.orchestra.repository.FieldRefType;
-import io.fixprotocol._2024.orchestra.repository.FieldRuleType;
-import io.fixprotocol._2024.orchestra.repository.FieldType;
-import io.fixprotocol._2024.orchestra.repository.FlowType;
-import io.fixprotocol._2024.orchestra.repository.GroupRefType;
-import io.fixprotocol._2024.orchestra.repository.GroupType;
-import io.fixprotocol._2024.orchestra.repository.MessageRefType;
-import io.fixprotocol._2024.orchestra.repository.MessageType;
-import io.fixprotocol._2024.orchestra.repository.MessageType.Responses;
-import io.fixprotocol._2024.orchestra.repository.PresenceT;
-import io.fixprotocol._2024.orchestra.repository.Repository;
-import io.fixprotocol._2024.orchestra.repository.ResponseType;
-import io.fixprotocol._2024.orchestra.repository.StateMachineType;
-import io.fixprotocol._2024.orchestra.repository.SupportType;
-=======
 import io.fixprotocol._2026.orchestra.repository.ActorType;
 import io.fixprotocol._2026.orchestra.repository.Actors;
 // Category component types removed with Orchestra v1.1 RC3
@@ -96,7 +70,6 @@
 import io.fixprotocol._2026.orchestra.repository.ResponseType;
 import io.fixprotocol._2026.orchestra.repository.StateMachineType;
 import io.fixprotocol._2026.orchestra.repository.SupportType;
->>>>>>> Stashed changes
 
 /**
  * @author Don Mendelson