fix merge conflicts

client/client.pro

@@ -19,6 +19,7 @@ include ("3rd/SortFilterProxyModel/SortFilterProxyModel.pri")
 HEADERS  += \
     ../ipc/ipc.h \
    configurators/cloak_configurator.h \
+   configurators/ikev2_configurator.h \
    configurators/shadowsocks_configurator.h \
    configurators/ssh_configurator.h \
    configurators/vpn_configurator.h \
@@ -34,6 +35,7 @@ HEADERS  += \
     debug.h \
     defines.h \
     managementserver.h \
+   protocols/ikev2_vpn_protocol.h \
    protocols/openvpnovercloakprotocol.h \
    protocols/protocols_defs.h \
     protocols/shadowsocksvpnprotocol.h \
@@ -73,6 +75,7 @@ HEADERS  += \
 
 SOURCES  += \
    configurators/cloak_configurator.cpp \
+   configurators/ikev2_configurator.cpp \
    configurators/shadowsocks_configurator.cpp \
    configurators/ssh_configurator.cpp \
    configurators/vpn_configurator.cpp \
@@ -87,6 +90,7 @@ SOURCES  += \
     debug.cpp \
     main.cpp \
     managementserver.cpp \
+   protocols/ikev2_vpn_protocol.cpp \
    protocols/openvpnovercloakprotocol.cpp \
    protocols/protocols_defs.cpp \
     protocols/shadowsocksvpnprotocol.cpp \
@@ -122,9 +126,6 @@ SOURCES  += \
     protocols/vpnprotocol.cpp \
     protocols/openvpnprotocol.cpp \
 
-FORMS    += \
-   ui/server_widget.ui
-
 RESOURCES += \
     resources.qrc