fix: merge conflict

Remove duplicated lines created when merging main into dev

Author: rubenperezm

pystrukts/list/doubly_linked_list.py

@@ -30,7 +30,6 @@ def __str__(self):
         return f"DoublyLinkedNode({self.data}){' <-> ' + str(self.next) if self.next else ''}"
 
 @dataclass
-class DoublyLinkedList(LinkedList[DoublyLinkedNode]):
 class DoublyLinkedList(LinkedList[DoublyLinkedNode]):
     '''
     DoublyLinkedList Class.
@@ -62,9 +61,6 @@ class DoublyLinkedList(LinkedList[DoublyLinkedNode]):
     def __init__(self, circular: bool = False):
         super().__init__(DoublyLinkedNode, circular)
 
-    def _link(self, node1: DoublyLinkedNode, node2: DoublyLinkedNode):
-        super().__init__(DoublyLinkedNode, circular)
-
     def _link(self, node1: DoublyLinkedNode, node2: DoublyLinkedNode):
         '''
         Link two nodes.
@@ -78,12 +74,4 @@ def _link(self, node1: DoublyLinkedNode, node2: DoublyLinkedNode):
         node1.next = node2
         if node2:
             node2.prev = node1
-    
-            node1 (DoublyLinkedNode): The first node.
-            node2 (DoublyLinkedNode): The second node.
-        '''
-
-        node1.next = node2
-        if node2:
-            node2.prev = node1
 

pystrukts/list/singly_linked_list.py

@@ -27,9 +27,6 @@ class SinglyLinkedNode:
     def __str__(self):
         return f"SinglyLinkedNode({self.data}){' -> ' + str(self.next) if self.next else ''}"
 
-
-class SinglyLinkedList(LinkedList[SinglyLinkedNode]):
-
 class SinglyLinkedList(LinkedList[SinglyLinkedNode]):
     '''
     SinglyLinkedList Class.
@@ -61,9 +58,6 @@ class SinglyLinkedList(LinkedList[SinglyLinkedNode]):
     def __init__(self, circular: bool = False):
         super().__init__(SinglyLinkedNode, circular)
 
-    def _link(self, node1: SinglyLinkedNode, node2: SinglyLinkedNode):
-        super().__init__(SinglyLinkedNode, circular)
-
     def _link(self, node1: SinglyLinkedNode, node2: SinglyLinkedNode):
         '''
         Link two nodes.
@@ -75,8 +69,3 @@ def _link(self, node1: SinglyLinkedNode, node2: SinglyLinkedNode):
         '''
 
         node1.next = node2
-            node1 (SinglyLinkedNode): The first node.
-            node2 (SinglyLinkedNode): The second node.
-        '''
-
-        node1.next = node2