| commit | a9b2d3ae21172cb7b583f01d3ba6d836e238749f | [log] [tgz] |
|---|---|---|
| author | Pankaj Berde <pankaj@onlab.us> | Fri Apr 05 13:19:51 2013 -0700 |
| committer | Pankaj Berde <pankaj@onlab.us> | Fri Apr 05 13:19:51 2013 -0700 |
| tree | 0f70b4121fd6539fa891d3a371db4ba08d3243de | |
| parent | 20861b2a423c06c2dfc89a8c8d3297ae8cca403f [diff] [blame] |
Fix Merge issues
diff --git a/start-rest.sh b/start-rest.sh index 8251c0f..01e7638 100755 --- a/start-rest.sh +++ b/start-rest.sh
@@ -1,7 +1,7 @@ #! /bin/bash # Change this accordingly -ONOSDIR=${HOME}/src/ONOS +ONOSDIR=${HOME}/ONOS script_name="topology_rest.py" #######################