Merge Master in geni-v3 conflict resolution

[sfa.git] / sfa / rspecs / elements / node.py

diff --git a/sfa/rspecs/elements/node.py b/sfa/rspecs/elements/node.py
index 7c467f4..e0f65e4 100644 (file)
--- a/sfa/rspecs/elements/node.py
+++ b/sfa/rspecs/elements/node.py
@@ -1,6 +1,6 @@
 from sfa.rspecs.elements.element import Element
  
-class Node(Element):
+class NodeElement(Element):
     
     fields = [
         'client_id',