# Conflicts: # code/hpdos_client/app.config # code/hpdos_client/app/src/main/java/HpdosClient/ClientRunner.java