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 · 2026-01-23 13:02:05 +09:00 · 2026-01-23 11:41:21 +09:00
1 changed files with 6 additions and 0 deletions
@@ -17,5 +17,11 @@ 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():
+    print("이것은 샘플 정보 메시지입니다.")
 # https://www.jetbrains.com/help/pycharm/에서 PyCharm 도움말 참조
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
hocean.controllab01@outlook.com	1dad4bcd4d	Merge branch 'Func2' # Conflicts: # main.py	2026-01-23 13:02:05 +09:00
hocean.controllab01@outlook.com	ffce259905	func2에서 show_information 추가함.	2026-01-23 11:41:21 +09:00