commit c8f63280d983c43e4330c9e783b6ae6fad716a9d
author yoshitomo <yoshitomo@yoshitomos-macbook-air.local> Sat Nov 23 10:02:46 2013 -0800
committer yoshitomo <yoshitomo@yoshitomos-macbook-air.local> Sat Nov 23 10:02:46 2013 -0800
tree 45e2c7e4d3048c7cb9494b1d96453bffa5c19a20
parent 0fee3de4344f76cd849bea23d58b6eca9f6e120e

Fixed conflict

src/main/java/net/onrc/onos/ofcontroller/topology/web/RouteResource.java

diff --git a/src/main/java/net/onrc/onos/ofcontroller/topology/web/RouteResource.java b/src/main/java/net/onrc/onos/ofcontroller/topology/web/RouteResource.java
index 839ba28..0d33b27 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/topology/web/RouteResource.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/topology/web/RouteResource.java
@@ -19,11 +19,6 @@
 
     @Get("json")
     public DataPath retrieve() {
-<<<<<<< HEAD
-        ITopoRouteService topoRouteService = new TopoRouteService("titan", "");
-	if (topoRouteService == null) {
-	    log.debug("Topology Route Service not found");
-=======
 	// Get the services that are needed for the computation
 	ITopologyNetService topologyNetService =
 	    (ITopologyNetService)getContext().getAttributes().
@@ -38,7 +33,6 @@
 	}
 	if (flowService == null) {
 	    log.debug("Flow Service not found");
->>>>>>> master
 	    return null;
 	}