SteveJones72's Potential New Feature to B2S Snippet x/y translation #71

vpinball · Jun 26, 2024 · e5afa56 · e5afa56
1 parent 5bc37ea
commit e5afa56
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/b2sbackglassserver/b2sbackglassserver/Classes/B2SScreen.vb b/b2sbackglassserver/b2sbackglassserver/Classes/B2SScreen.vb
@@ -47,7 +47,11 @@ Public Class B2SScreen
     Public Property StartBackground() As Boolean = False
 
     Public Property rescaleBackglass As SizeF = New SizeF(1, 1)
+<<<<<<< HEAD
 
+=======
+
+>>>>>>> ac68072 (SteveJones72's Potential New Feature to B2S Snippet x/y translation #71)
 #Region "constructor and startup"
 
     Public Sub New()