Add flow pushing rules.

[affinity.git] / affinity / implementation / pom.xml

diff --git a/affinity/implementation/pom.xml b/affinity/implementation/pom.xml
index 84df90b5a512513a2e03d7a857b52874f6bc432a..ed7f2fa5cdabf484e113bbe9594ba77fe8c489f4 100644 (file)
--- a/affinity/implementation/pom.xml
+++ b/affinity/implementation/pom.xml
@@ -124,8 +124,13 @@
       <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>