remove switchDpid from OFMatch

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

@@ -43,6 +43,7 @@ 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;
@@ -673,6 +674,14 @@ 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,6 +2,7 @@ package net.floodlightcontroller.flowcache;
 
 import java.util.ArrayList;
 
+import net.floodlightcontroller.core.FloodlightContext;
 import net.floodlightcontroller.core.IListener;
 import org.openflow.protocol.OFType;
 
@@ -36,6 +37,10 @@ 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/flowcache/OFMatchReconcile.java

 package net.floodlightcontroller.flowcache;
 
 import net.floodlightcontroller.core.FloodlightContext;
-
 import org.openflow.protocol.OFMatchWithSwDpid;
 
 /**