From ac59079db3431acd24c2c40da6e95dd4fbff643b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B4=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D1=81?= Date: Wed, 26 Jun 2024 18:48:16 +0300 Subject: [PATCH 1/7] 1 --- src/main/kotlin/Lessson_1/L1.kt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 src/main/kotlin/Lessson_1/L1.kt diff --git a/src/main/kotlin/Lessson_1/L1.kt b/src/main/kotlin/Lessson_1/L1.kt new file mode 100644 index 00000000..f309d3ad --- /dev/null +++ b/src/main/kotlin/Lessson_1/L1.kt @@ -0,0 +1,5 @@ +package Lessson_1 + +fun main() { + +} \ No newline at end of file From c9348a02410e80a353ad43b3b703e660ccf8ecaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B4=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D1=81?= Date: Wed, 26 Jun 2024 18:49:51 +0300 Subject: [PATCH 2/7] Ks-1-1. --- .idea/misc.xml | 2 +- .idea/vcs.xml | 1 + src/main/kotlin/Lessson_1/L1.kt | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 9c8e7400..45b76e11 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1ddf..83067447 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/src/main/kotlin/Lessson_1/L1.kt b/src/main/kotlin/Lessson_1/L1.kt index f309d3ad..ccef0f92 100644 --- a/src/main/kotlin/Lessson_1/L1.kt +++ b/src/main/kotlin/Lessson_1/L1.kt @@ -1,5 +1,6 @@ package Lessson_1 fun main() { - + var ordersOnWeb = 75 + val textAfterPurchase = "Благодарим за заказ, ждем Вас вновь!" } \ No newline at end of file From 33b365428c7270c9387a0c146986efc22868a573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B4=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D1=81?= Date: Wed, 26 Jun 2024 19:10:15 +0300 Subject: [PATCH 3/7] Ks-1-2. --- src/main/kotlin/Lessson_1/L2.kt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/main/kotlin/Lessson_1/L2.kt diff --git a/src/main/kotlin/Lessson_1/L2.kt b/src/main/kotlin/Lessson_1/L2.kt new file mode 100644 index 00000000..6315675d --- /dev/null +++ b/src/main/kotlin/Lessson_1/L2.kt @@ -0,0 +1,16 @@ +package Lessson_1 + + +fun main() { + var ordersOnWeb = 75 + val textAfterPurchase = "Благодарим за заказ, ждем Вас вновь!" + println(ordersOnWeb) + println(textAfterPurchase) + + /* + var workers = 2000 + println(workers) + */ + var workers = 1999 + println(workers) +} \ No newline at end of file From 53b69540006252593640993c7045a5498ec7242e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B4=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D1=81?= Date: Thu, 27 Jun 2024 12:37:32 +0300 Subject: [PATCH 4/7] Ks-1-3 --- src/main/kotlin/Lessson_1/L1.kt | 6 ------ src/main/kotlin/Lessson_1/L2.kt | 8 ++++---- 2 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 src/main/kotlin/Lessson_1/L1.kt diff --git a/src/main/kotlin/Lessson_1/L1.kt b/src/main/kotlin/Lessson_1/L1.kt deleted file mode 100644 index ccef0f92..00000000 --- a/src/main/kotlin/Lessson_1/L1.kt +++ /dev/null @@ -1,6 +0,0 @@ -package Lessson_1 - -fun main() { - var ordersOnWeb = 75 - val textAfterPurchase = "Благодарим за заказ, ждем Вас вновь!" -} \ No newline at end of file diff --git a/src/main/kotlin/Lessson_1/L2.kt b/src/main/kotlin/Lessson_1/L2.kt index 6315675d..e7158a8f 100644 --- a/src/main/kotlin/Lessson_1/L2.kt +++ b/src/main/kotlin/Lessson_1/L2.kt @@ -7,10 +7,10 @@ fun main() { println(ordersOnWeb) println(textAfterPurchase) - /* + var workers = 2000 - println(workers) - */ - var workers = 1999 + //println(workers) + + workers = 1999 println(workers) } \ No newline at end of file From 5fb749343cce0085eabcfe77a67bc2209a57dd1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B4=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D1=81?= Date: Fri, 28 Jun 2024 12:34:54 +0300 Subject: [PATCH 5/7] Ks-2-2 --- .gitignore | 2 ++ src/main/kotlin/Lessson_1/L2.kt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f68d1099..9c5789e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ ### IntelliJ IDEA ### +.idea/vcs.xml +.idea/* out/ !**/src/main/**/out/ !**/src/test/**/out/ diff --git a/src/main/kotlin/Lessson_1/L2.kt b/src/main/kotlin/Lessson_1/L2.kt index e7158a8f..d822ef87 100644 --- a/src/main/kotlin/Lessson_1/L2.kt +++ b/src/main/kotlin/Lessson_1/L2.kt @@ -2,7 +2,7 @@ package Lessson_1 fun main() { - var ordersOnWeb = 75 + val ordersOnWeb = 75 val textAfterPurchase = "Благодарим за заказ, ждем Вас вновь!" println(ordersOnWeb) println(textAfterPurchase) From c053e485c27eed646fda18bb9a3f04b2e3e898cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B4=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D1=81?= Date: Fri, 28 Jun 2024 12:40:07 +0300 Subject: [PATCH 6/7] Ks-2-2 --- .idea/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.idea/.gitignore b/.idea/.gitignore index 26d33521..4486945d 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -1,3 +1,4 @@ # Default ignored files /shelf/ /workspace.xml +.idea/vcs.xml From aeb08ad82089406e693fb08b98626baa31810b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B4=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D1=81?= Date: Fri, 28 Jun 2024 13:29:29 +0300 Subject: [PATCH 7/7] Ks-2-2 --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9c5789e2..8b2dd398 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ ### IntelliJ IDEA ### -.idea/vcs.xml .idea/* out/ !**/src/main/**/out/ @@ -26,6 +25,8 @@ bin/ ### VS Code ### .vscode/ +.idea/vcs.xml + ### Mac OS ### .DS_Store \ No newline at end of file