From 64b5a9a41840227fc34c57ae95e9eb1bc51bd052 Mon Sep 17 00:00:00 2001
From: Suchi Raman <suchi.raman@plexxi.com>
Date: Thu, 26 Sep 2013 13:56:54 -0400
Subject: [PATCH] Add a simple l2agent for demo. Signed-off-by: Suchi Raman
 <suchi.raman@plexxi.com>

---
 affinity/implementation/pom.xml                          | 5 -----
 .../affinity/affinity/internal/AffinityManagerImpl.java  | 9 +--------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/affinity/implementation/pom.xml b/affinity/implementation/pom.xml
index ed7f2fa..84df90b 100644
--- a/affinity/implementation/pom.xml
+++ b/affinity/implementation/pom.xml
@@ -124,13 +124,8 @@
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-<<<<<<< HEAD
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>l2agent</artifactId>
-=======
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>tutorial_L2_forwarding</artifactId>
->>>>>>> Add flow pushing rules.
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
diff --git a/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/AffinityManagerImpl.java b/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/AffinityManagerImpl.java
index fa3ee3d..c65531f 100644
--- a/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/AffinityManagerImpl.java
+++ b/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/AffinityManagerImpl.java
@@ -90,6 +90,7 @@ import org.opendaylight.controller.hosttracker.IfIptoHost;
 import org.opendaylight.controller.hosttracker.hostAware.HostNodeConnector;
 import org.opendaylight.controller.switchmanager.ISwitchManager;
 import org.opendaylight.affinity.l2agent.L2Agent;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -244,20 +245,12 @@ public class AffinityManagerImpl implements IAffinityManager, IConfigurationCont
             this.fps = null;
         }
     }
-<<<<<<< HEAD
     public void setL2Agent(L2Agent s)
-=======
-    public void setL2Agent(TutorialL2Forwarding s)
->>>>>>> Add flow pushing rules.
     {
         this.l2agent = s;
     }
 
-<<<<<<< HEAD
     public void unsetL2Agent(L2Agent s) {
-=======
-    public void unsetL2Agent(TutorialL2Forwarding s) {
->>>>>>> Add flow pushing rules.
         if (this.l2agent == s) {
             this.l2agent = null;
         }
-- 
2.36.6