Remove upstream from workflow

jamescourtney · Nov 20, 2024 · 2305caa · 2305caa
1 parent 7ba3948
commit 2305caa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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.