fix warnings

src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java

@@ -43,7 +43,6 @@ import net.floodlightcontroller.core.IInfoProvider;
 import net.floodlightcontroller.core.IOFMessageListener;
 import net.floodlightcontroller.core.IOFSwitch;
 import net.floodlightcontroller.core.IFloodlightProviderService.Role;
-import net.floodlightcontroller.core.IListener.Command;
 import net.floodlightcontroller.core.module.FloodlightModuleContext;
 import net.floodlightcontroller.core.module.IFloodlightModule;
 import net.floodlightcontroller.core.module.IFloodlightService;
@@ -674,14 +673,6 @@ public class DeviceManagerImpl implements
                           Map<String, String> removedControllerNodeIPs) {
         // no-op
     }
-    
-    // **********************
-    // IFlowReconcileListener
-    // **********************
- 
-    public Command reconcileFlows(ArrayList<OFMatchReconcile> ofmRcList, FloodlightContext cntx) {
-        return Command.CONTINUE;
-    }
 
     // ****************
     // Internal methods

src/main/java/net/floodlightcontroller/flowcache/IFlowReconcileListener.java

@@ -2,7 +2,6 @@ package net.floodlightcontroller.flowcache;
 
 import java.util.ArrayList;
 
-import net.floodlightcontroller.core.FloodlightContext;
 import net.floodlightcontroller.core.IListener;
 import org.openflow.protocol.OFType;
 
@@ -37,10 +36,6 @@ public interface IFlowReconcileListener extends IListener<OFType> {
      *           further. In this case the no reconciled flow-mods would 
      *           be programmed
      */
-<<<<<<< HEAD
     public Command reconcileFlows(ArrayList<OFMatchReconcile> ofmRcList);
-=======
-    public Command reconcileFlows(ArrayList<OFMatchReconcile> ofmRcList, FloodlightContext cntx);
->>>>>>> 764be04... remove switchDpid from OFMatch
 
 }

src/main/java/net/floodlightcontroller/forwarding/Forwarding.java

@@ -43,7 +43,6 @@ import net.floodlightcontroller.routing.IRoutingDecision;
 import net.floodlightcontroller.routing.IRoutingService;
 import net.floodlightcontroller.routing.Route;
 import net.floodlightcontroller.topology.ITopologyService;
-import net.floodlightcontroller.topology.TopologyManager;
 
 import org.openflow.protocol.OFFlowMod;
 import org.openflow.protocol.OFMatch;