From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Thu, 3 Oct 2013 09:27:50 +0000 (+0200)
Subject: fix merging error in iotlabv1Node.py
X-Git-Tag: sfa-3.0-2~17
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=7a512dc3c57b3a725dd6fe12e1367b360c9b1fdd

fix merging error in iotlabv1Node.py
---

diff --git a/sfa/rspecs/elements/versions/iotlabv1Node.py b/sfa/rspecs/elements/versions/iotlabv1Node.py
index df3dc6cc..6f9502f5 100644
--- a/sfa/rspecs/elements/versions/iotlabv1Node.py
+++ b/sfa/rspecs/elements/versions/iotlabv1Node.py
@@ -55,20 +55,6 @@ class Iotlabv1Node:
 
     @staticmethod
     def add_nodes(xml, nodes, rspec_content_type=None):
-        """Adds the nodes to the xml.
-
-        Adds the nodes as well as dedicated iotlab fields to the node xml
-        element.
-
-        :param xml: the xml being constructed.
-        :type xml: xml
-        :param nodes: list of node dict
-        :type nodes: list
-        :returns: a list of node elements.
-        :rtype: list
-
-        """
->>>>>>> f7d277c... rspec.version.add_nodes take an extra arg to handle Request RSpec
         #Add network item in the xml
         network_elems = xml.xpath('//network')
         if len(network_elems) > 0: