Merge branch 'Func2'

# Conflicts: # main.py
func2에서 show_information 추가함.
2026-01-23 13:02:05 +09:00 · 2026-01-23 11:41:21 +09:00 · 2026-01-23 11:38:30 +09:00
1 changed files with 8 additions and 0 deletions
@@ -13,4 +13,12 @@ def print_hi(name):
 if __name__ == '__main__':
    print_hi('PyCharm')

+# 1번 개발자 수정
+def add_procedure (*a : int) -> int:
+    return sum(a)
+
+
+
+def show_information():
+    print("이것은 샘플 정보 메시지입니다.")
 # https://www.jetbrains.com/help/pycharm/에서 PyCharm 도움말 참조
Author	SHA1	Message	Date
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
hocean.controllab01@outlook.com	716af8106c	add_procedure 추가함	2026-01-23 11:38:30 +09:00