8810b1dcae
# Conflicts: # .idea/.gitignore # src/com/wasteinformationserver/main.java |
||
---|---|---|
.idea | ||
lib | ||
resources/wwwroot | ||
src | ||
README.md | ||
WasteInformationServer.iml |
8810b1dcae
# Conflicts: # .idea/.gitignore # src/com/wasteinformationserver/main.java |
||
---|---|---|
.idea | ||
lib | ||
resources/wwwroot | ||
src | ||
README.md | ||
WasteInformationServer.iml |