diff --git a/VolkovVA/cod.py b/VolkovVA/cod.py index 1bdb743..25c43b5 100644 --- a/VolkovVA/cod.py +++ b/VolkovVA/cod.py @@ -1,4 +1,5 @@ import random as rnd +<<<<<<< HEAD def ll_insert(head, name, phone): new_node = {'name': name, 'phone': phone, 'next': None} @@ -59,4 +60,6 @@ def ll_list_all(head): record += [(current['name'], current['phone'])] current = current['next'] res = sort_records(record) - return res \ No newline at end of file + return res +======= +>>>>>>> 221b0dbe36c30826c59c8721814c9bb881eafeee