Skip to content

Commit 2d4fcfe

Browse files
JavaIsJavaScriptJavaIsJavaScript
committed
fix build
1 parent 3989049 commit 2d4fcfe

1 file changed

Lines changed: 0 additions & 3 deletions

File tree

‎src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@
33
import de.rwth.idsg.steve.service.ChargePointService12_Client;
44
import de.rwth.idsg.steve.service.ChargePointService15_Client;
55
import de.rwth.idsg.steve.service.ChargePointService16_Client;
6-
<<<<<<< HEAD
76
import de.rwth.idsg.steve.web.dto.ocpp.*;
8-
=======
97
import de.rwth.idsg.steve.web.dto.ocpp.ChangeConfigurationParams;
108
import de.rwth.idsg.steve.web.dto.ocpp.ConfigurationKeyEnum;
119
import de.rwth.idsg.steve.web.dto.ocpp.ConfigurationKeyReadWriteEnum;
1210
import de.rwth.idsg.steve.web.dto.ocpp.GetConfigurationParams;
1311
import de.rwth.idsg.steve.web.dto.ocpp.TriggerMessageParams;
14-
>>>>>>> 2a5ede16f7c84864afe1d33ea46fc66233c6c1e5
1512
import org.springframework.beans.factory.annotation.Autowired;
1613
import org.springframework.beans.factory.annotation.Qualifier;
1714
import org.springframework.stereotype.Controller;

0 commit comments

Comments
 (0)