increased number of routes in root node so that it can hold all routes in the simulation

2015-08-24 20:49:50 +02:00 · 2015-08-24 20:49:50 +02:00 · ad0e624d01
parent 37c5f741e9
commit ad0e624d01
1 changed files with 1 additions and 1 deletions
--- a/regression-tests/12-rpl/04-rpl-large-network.csc
+++ b/regression-tests/12-rpl/04-rpl-large-network.csc
@ -1,3 +1,4 @@
+<<<<<<< 1d90b9290e293eedcb6451dd86c474ec168f688c
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
  <project EXPORT="discard">[APPS_DIR]/mrm</project>
@ -7058,4 +7059,3 @@ while(true) {&#xD;
    <location_y>43</location_y>
  </plugin>
 </simconf>
-