Resolve merge conflict in myLaptop.py

Author: aydaeslami

.github/ISSUE_TEMPLATE/config.yml

@@ -22,10 +22,12 @@ class Laptop:
     screen_size_in_inches: float
     operating_system: OperatingSystem
 
+
 def allocate_laptops(
     people: List[Person],
     laptops: List[Laptop]
 ) -> dict[str, tuple[str, int]]:
+
     allocateLp = {}
     lpNewList = laptops.copy()