Merge branch 'master' into Func1

# Conflicts: # main.py
add_procedure2 추가
2026-01-23 13:21:21 +09:00 · 2026-01-23 13:14:13 +09:00
1 changed files with 3 additions and 0 deletions
@@ -17,6 +17,9 @@ if __name__ == '__main__':
 def add_procedure (*a : int) -> int:
    return sum(a)
 # 1번 개발자 추가 수정
 def add_procedure2 (a : int, b : int) -> int:
    return a + b
 def show_information():
Author	SHA1	Message	Date
hocean.controllab01@outlook.com	9a8489c10d	Merge branch 'master' into Func1 # Conflicts: # main.py	2026-01-23 13:21:21 +09:00
hocean.controllab01@outlook.com	b3834e29da	add_procedure2 추가	2026-01-23 13:14:13 +09:00