Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
879ab675b0
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_16" project-jdk-name="17" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
</project>
|
@ -9,4 +9,5 @@
|
||||
* @author Gubitz, Wöstemeyer, Pfannenstiel, Maier, Vigier :D
|
||||
*/
|
||||
public class Gebiet {
|
||||
//gepushter kommentar
|
||||
}
|
||||
|
@ -3,8 +3,8 @@
|
||||
* interpretieren, als Gebiet-Objekte zu speichern und diese in Form einer Liste zur Verfügung
|
||||
* zu stellen.
|
||||
*
|
||||
* @author Gubitz, Wöstemeyer, Pfannenstiel, Maier, Vigier :D
|
||||
* @author Gubitz, Wöstemeyer, Pfannenstiel, Maier, M. Vigier :D
|
||||
*/
|
||||
public class GebietsDatei {
|
||||
//wg
|
||||
//wg //er kam, er sah und siegte
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user