School/WasteInformationServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	.idea/.gitignore
#	src/com/wasteinformationserver/main.java
This commit is contained in:
Gregor_Dutzler
2019-10-11 15:06:00 +02:00
parent 94c96d04ef dfd3cff5a2
commit 8810b1dcae
35 changed files with 73 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.idea/artifacts/WasteinformationServer.xml generated Normal file
View File

@@ -0,0 +1,11 @@
<component name="ArtifactManager">
<artifact type="jar" build-on-make="true" name="WasteinformationServer">
<output-path>$PROJECT_DIR$/out/artifacts/WasteinformationServer</output-path>
<root id="archive" name="WasteinformationServer.jar">
<element id="module-output" name="WasteInformationServer" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/mysql-connector-java-5.1.44-bin.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/org.eclipse.paho.client.mqttv3-1.2.1.jar" path-in-jar="/" />
<element id="dir-copy" path="$PROJECT_DIR$/resources" />
</root>
</artifact>
</component>