From 2305caa3a58a1b31e25724f347fb4af27904d8d5 Mon Sep 17 00:00:00 2001
From: Truman Mulholland <truman.mulholland@gmail.com>
Date: Thu, 21 Nov 2024 11:39:34 +1300
Subject: [PATCH] Remove upstream from workflow

---
 .github/workflows/dotnet.yml                                | 5 ++---
 src/FlatSharp.Compiler/SchemaModel/ValueUnionSchemaModel.cs | 3 ---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 013a4fca..f11be182 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -2,9 +2,8 @@ name: .NET
 
 on:
   push:
-    branches: [ main, upstream ]
+    branches: [ main ]
   pull_request:
-    branches: [ main, upstream ]
   workflow_dispatch:
 
 jobs:  
@@ -44,7 +43,7 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 6.0.x
-       
+
     - name: Restore dependencies
       working-directory: src
       run: dotnet restore
diff --git a/src/FlatSharp.Compiler/SchemaModel/ValueUnionSchemaModel.cs b/src/FlatSharp.Compiler/SchemaModel/ValueUnionSchemaModel.cs
index 60f7c834..34544142 100644
--- a/src/FlatSharp.Compiler/SchemaModel/ValueUnionSchemaModel.cs
+++ b/src/FlatSharp.Compiler/SchemaModel/ValueUnionSchemaModel.cs
@@ -123,13 +123,10 @@ protected override void OnWriteCode(CodeWriter writer, CompileContext context)
         this.Attributes.EmitAsMetadata(writer);
         writer.AppendLine("[System.Runtime.CompilerServices.CompilerGenerated]");
         writer.AppendLine($"public {@unsafe} partial struct {this.Name} : {interfaceName}");
-<<<<<<< HEAD
-=======
         if (!generateUnsafeItems && context.Options.GenerateMethods)
         {
             writer.AppendLine($", System.IEquatable<{this.Name}>");
         }
->>>>>>> 1b219b8 (Fix missing checks for generate-methods option)
         using (writer.WithBlock())
         {
             // Generate an internal type enum.