oops

Author: lgarber-akamai

linode_api4/objects/networking.py

@@ -101,9 +101,6 @@ def linode(self):
 
         return self._linode
 
-<<<<<<< Updated upstream
-    # TODO (Enhanced Interfaces): Add `interface` property method
-=======
     @property
     def interface(self) -> Optional["LinodeInterface"]:
         """
@@ -128,7 +125,6 @@ def interface(self) -> Optional["LinodeInterface"]:
             )
 
         return self._interface
->>>>>>> Stashed changes
 
     def to(self, linode):
         """

test/integration/models/linode/test_linode.py

@@ -9,20 +9,15 @@
 
 import pytest
 
-<<<<<<< Updated upstream
-=======
-from linode_api4 import (
-    InterfaceGeneration,
-    LinodeInterface,
-)
->>>>>>> Stashed changes
 from linode_api4.errors import ApiError
 from linode_api4.objects import (
     Config,
     ConfigInterface,
     ConfigInterfaceIPv4,
     Disk,
     Instance,
+    InterfaceGeneration,
+    LinodeInterface,
     Type,
 )
 from linode_api4.objects.linode import InstanceDiskEncryptionType, MigrationType