SJ84
/
INT_PT002
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into HEAD 

# Conflicts:
#	INT_PT002/Forms/FormMain.cs
main
DESKTOP-999R8N3\CJY 2024-04-01 10:14:09 +09:00
parent 0ad52fb084 32aa554dec
commit ea6ae58aa7
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
INT_PT002/Forms/FormMain.cs
View File

@ -246,7 +246,11 @@ namespace INT_PT002.Forms
} }
private void CreateForm() private void CreateForm()
{ {
<<<<<<< HEAD
this.ChildFormMainDisplay = new FormMainDisplay3(this); this.ChildFormMainDisplay = new FormMainDisplay3(this);
=======
this.ChildFormMainDisplay = new FormMainDisplay4(this);
>>>>>>> main
this.ChildFormMenu = new FormMenu(this); this.ChildFormMenu = new FormMenu(this);
this.smartForm1.MainForm = this; this.smartForm1.MainForm = this;