From 3070fab91bba47911c18e7f805938301983b758c Mon Sep 17 00:00:00 2001
From: Pilzinsel64 <pascal.schedel@dr-schneider.com>
Date: Wed, 20 Nov 2024 12:41:39 +0100
Subject: [PATCH] resolve merge confligts?

---
 .../Pilz.Drawing.Drawing3D.OpenGLFactory.vbproj    |  2 --
 .../Rendering/ContentPipe.vb                       | 14 ++------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/Pilz.Drawing.Drawing3D.OpenGLRenderer/Pilz.Drawing.Drawing3D.OpenGLFactory.vbproj b/Pilz.Drawing.Drawing3D.OpenGLRenderer/Pilz.Drawing.Drawing3D.OpenGLFactory.vbproj
index 9d53029..bf6c0ff 100644
--- a/Pilz.Drawing.Drawing3D.OpenGLRenderer/Pilz.Drawing.Drawing3D.OpenGLFactory.vbproj
+++ b/Pilz.Drawing.Drawing3D.OpenGLRenderer/Pilz.Drawing.Drawing3D.OpenGLFactory.vbproj
@@ -31,8 +31,6 @@
   <ItemGroup>
     <PackageReference Include="OpenTK.Input" Version="4.8.2" />
     <PackageReference Include="OpenTK.WinForms" Version="4.0.0-pre.6" />
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OpenTK" Version="4.8.2" />
diff --git a/Pilz.Drawing.Drawing3D.OpenGLRenderer/Rendering/ContentPipe.vb b/Pilz.Drawing.Drawing3D.OpenGLRenderer/Rendering/ContentPipe.vb
index 0fe7ef9..a317f5f 100644
--- a/Pilz.Drawing.Drawing3D.OpenGLRenderer/Rendering/ContentPipe.vb
+++ b/Pilz.Drawing.Drawing3D.OpenGLRenderer/Rendering/ContentPipe.vb
@@ -1,19 +1,9 @@
-' Nicht gemergte Änderung aus Projekt "Pilz.Drawing.Drawing3D.OpenGLFactory (net6.0-windows)" 
-' Vor:
-' Imports OpenTK
-' Imports OpenTK.Graphics.OpenGL
-' Imports System.Drawing
-' Nach:
-' Imports System.Drawing
-' Imports System.Drawing.Imaging
-' 
-' Imports OpenTK
-.Drawing
-Imports System.Drawing.Imaging
+Imports System.Drawing.Imaging
 
 Imports OpenTK.Graphics.OpenGL
 
 Imports Bitmap = System.Drawing.Bitmap
+Imports System.Drawing
 
 Namespace RenderingN