Delete commented out merge conflict resolution

felser · felser · commit f0a5dce37fd1 · 2018-10-01T08:25:47.000-05:00
diff --git a/features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP_CellularNetwork.cpp b/features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP_CellularNetwork.cpp
@@ -34,15 +34,7 @@ bool UBLOX_PPP_CellularNetwork::get_modem_stack_type(nsapi_ip_stack_t requested_
 
 AT_CellularNetwork::RegistrationMode UBLOX_PPP_CellularNetwork::has_registration(RegistrationType reg_type)
 {
-//<<<<<<< HEAD
     return (reg_type == C_REG || reg_type == C_GREG) ? RegistrationModeLAC : RegistrationModeDisable;
-//=======
-//#ifdef TARGET_DRAGONFLY_L471QG
-//    return (reg_type == C_REG || reg_type == C_EREG);
-//#else
-//    return (reg_type == C_REG || reg_type == C_GREG || reg_type == C_EREG);
-//#endif
-//>>>>>>> Fixed spacing/tabs and clean up targets.json
 }
 
 nsapi_error_t UBLOX_PPP_CellularNetwork::set_access_technology_impl(RadioAccessTechnology opRat)

Original file line number	Diff line number	Diff line change
`@@ -34,15 +34,7 @@ bool UBLOX_PPP_CellularNetwork::get_modem_stack_type(nsapi_ip_stack_t requested_`
`34`	`34`
`35`	`35`	`AT_CellularNetwork::RegistrationMode UBLOX_PPP_CellularNetwork::has_registration(RegistrationType reg_type)`
`36`	`36`	`{`
`37`		`-//<<<<<<< HEAD`
`38`	`37`	`return (reg_type == C_REG \|\| reg_type == C_GREG) ? RegistrationModeLAC : RegistrationModeDisable;`
`39`		`-//=======`
`40`		`-//#ifdef TARGET_DRAGONFLY_L471QG`
`41`		`-// return (reg_type == C_REG \|\| reg_type == C_EREG);`
`42`		`-//#else`
`43`		`-// return (reg_type == C_REG \|\| reg_type == C_GREG \|\| reg_type == C_EREG);`
`44`		`-//#endif`
`45`		`-//>>>>>>> Fixed spacing/tabs and clean up targets.json`
`46`	`38`	`}`
`47`	`39`
`48`	`40`	`nsapi_error_t UBLOX_PPP_CellularNetwork::set_access_technology_impl(RadioAccessTechnology opRat)`