From ad0e624d01637072d23bb4985f32fe5320b179ca Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Mon, 24 Aug 2015 20:49:50 +0200
Subject: [PATCH] increased number of routes in root node so that it can hold
 all routes in the simulation

---
 regression-tests/12-rpl/04-rpl-large-network.csc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/regression-tests/12-rpl/04-rpl-large-network.csc b/regression-tests/12-rpl/04-rpl-large-network.csc
index 8b3ca0d8a..88d3774bf 100644
--- 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>
-