ZHAW-IT21b_WIN
/
gruppe06-hufflepuff-projekt3-catan
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' 

# Conflicts:
#	src/ch/zhaw/catan/Structure.java
This commit is contained in:
Andrin Fassbind 2021-11-29 16:47:41 +01:00
parent 971cfe8868 cf94a835fc
commit cb9e22ea92
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ch/zhaw/catan/Structure.java
View File

@ -7,7 +7,7 @@ public abstract class Structure {
this.faction = faction; this.faction = faction;
} }
public Config.Faction getFaction() { public String toString() {
return faction; return faction.toString();
} }
} }