Merge branch 'main' into HEAD

# Conflicts: # INT_PT002/Forms/FormMain.cs
2024-04-01 10:14:09 +09:00 · 2024-04-01 10:14:09 +09:00 · ea6ae58aa7
parent 0ad52fb084 32aa554dec
commit ea6ae58aa7
1 changed files with 4 additions and 0 deletions
--- a/INT_PT002/Forms/FormMain.cs
+++ b/INT_PT002/Forms/FormMain.cs
@ -246,7 +246,11 @@ namespace INT_PT002.Forms
        }
        private void CreateForm()
        {
+<<<<<<< HEAD
            this.ChildFormMainDisplay = new FormMainDisplay3(this);
+=======
+            this.ChildFormMainDisplay = new FormMainDisplay4(this);
+>>>>>>> main
            this.ChildFormMenu = new FormMenu(this);

            this.smartForm1.MainForm = this;