Fix rebase conflict file

felser · adbridge · commit 89bddfe466d8 · 2018-10-19T15:10:50.000+01:00
diff --git a/features/cellular/framework/AT/AT_CellularDevice.cpp b/features/cellular/framework/AT/AT_CellularDevice.cpp
@@ -171,20 +171,13 @@ CellularInformation *AT_CellularDevice::open_information(FileHandle *fh)
 void AT_CellularDevice::close_network()
 {
     if (_network) {
-<<<<<<< HEAD
         _network_ref_count--;
         if (_network_ref_count == 0) {
             ATHandler *atHandler = &_network->get_at_handler();
             delete _network;
             _network = NULL;
             release_at_handler(atHandler);
         }
-=======
-        ATHandler *at_handler = &_network->get_at_handler();
-        delete _network;
-        release_at_handler(at_handler);
-        _network = NULL;
->>>>>>> Rebase and changes for Dragonfly nano support
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -171,20 +171,13 @@ CellularInformation AT_CellularDevice::open_information(FileHandle fh)`
`171`	`171`	`void AT_CellularDevice::close_network()`
`172`	`172`	`{`
`173`	`173`	`if (_network) {`
`174`		`-<<<<<<< HEAD`
`175`	`174`	`_network_ref_count--;`
`176`	`175`	`if (_network_ref_count == 0) {`
`177`	`176`	`ATHandler *atHandler = &_network->get_at_handler();`
`178`	`177`	`delete _network;`
`179`	`178`	`_network = NULL;`
`180`	`179`	`release_at_handler(atHandler);`
`181`	`180`	`}`
`182`		`-=======`
`183`		`- ATHandler *at_handler = &_network->get_at_handler();`
`184`		`- delete _network;`
`185`		`- release_at_handler(at_handler);`
`186`		`- _network = NULL;`
`187`		`->>>>>>> Rebase and changes for Dragonfly nano support`
`188`	`181`	`}`
`189`	`182`	`}`
`190`	`183`