merge: resolved conflict in main.sh

2026-02-28 08:52:09 +03:00
parent b17e8a9c98 f4c21e017b
commit a0b70ac926
2 changed files with 19 additions and 0 deletions
--- a/main.sh
+++ b/main.sh
@@ -8,6 +8,8 @@ read num1
 echo "Введите второе число:"
 read num2

+nod_result=$("$SCRIPT_DIR/script_NOD.sh" "$num1" "$num2")
 nok_result=$("$SCRIPT_DIR/script_NOK.sh" "$num1" "$num2")

+echo "НОД($num1, $num2) = $nod_result"
 echo "НОК($num1, $num2) = $nok_result"