no message
							parent
							
								
									ea6ae58aa7
								
							
						
					
					
						commit
						6c7dbee190
					
				|  | @ -246,11 +246,8 @@ 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; | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue