fixed merge problem.
This commit is contained in:
		
							parent
							
								
									bbaf70f9af
								
							
						
					
					
						commit
						7114097601
					
				| 
						 | 
					@ -34,12 +34,12 @@ public class MainWindowController extends FXController {
 | 
				
			||||||
     * Method changes the language Setting to german
 | 
					     * Method changes the language Setting to german
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
    @FXML
 | 
					    @FXML
 | 
				
			||||||
    void changeLangToGerman(ActionEvent event) {
 | 
					    void changeLangToGerman() {
 | 
				
			||||||
        getLanguageConfigurator().changeLanguage(LanguageConfigurator.Language.GERMAN);
 | 
					        getLanguageConfigurator().changeLanguage(LanguageConfigurator.Language.GERMAN);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @FXML
 | 
					    @FXML
 | 
				
			||||||
    void changeLangToEnglish(ActionEvent event) {
 | 
					    void changeLangToEnglish() {
 | 
				
			||||||
        getLanguageConfigurator().changeLanguage(LanguageConfigurator.Language.ENGLISH);
 | 
					        getLanguageConfigurator().changeLanguage(LanguageConfigurator.Language.ENGLISH);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue