From e499c0272918aeb365be925a38b2704bbcaa03a1 Mon Sep 17 00:00:00 2001
From: ruttur66 <112100490+RuthBenTov@users.noreply.github.com>
Date: Sun, 23 Jul 2023 19:20:27 +0300
Subject: [PATCH 1/3] ruht

---
 04-Typescript/22-git/admin style/style.scss | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 04-Typescript/22-git/admin style/style.scss

diff --git a/04-Typescript/22-git/admin style/style.scss b/04-Typescript/22-git/admin style/style.scss
new file mode 100644
index 000000000..e69de29bb

From 6a713d5634d43c5ba1fb673ee37eda88fdc289dc Mon Sep 17 00:00:00 2001
From: ruttur66 <112100490+RuthBenTov@users.noreply.github.com>
Date: Sun, 23 Jul 2023 19:27:04 +0300
Subject: [PATCH 2/3] mm

---
 04-Typescript/22-git/admin style/dist/style.css | 1 +
 04-Typescript/22-git/admin style/style.scss     | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 04-Typescript/22-git/admin style/dist/style.css

diff --git a/04-Typescript/22-git/admin style/dist/style.css b/04-Typescript/22-git/admin style/dist/style.css
new file mode 100644
index 000000000..6c4db7c88
--- /dev/null
+++ b/04-Typescript/22-git/admin style/dist/style.css	
@@ -0,0 +1 @@
+@i;
\ No newline at end of file
diff --git a/04-Typescript/22-git/admin style/style.scss b/04-Typescript/22-git/admin style/style.scss
index e69de29bb..551e9b03f 100644
--- a/04-Typescript/22-git/admin style/style.scss	
+++ b/04-Typescript/22-git/admin style/style.scss	
@@ -0,0 +1 @@
+@import "../features/inventory/dist/inventory.scc"
\ No newline at end of file

From ba8e06844b94a2b617bc624475c4ae65dedb03f4 Mon Sep 17 00:00:00 2001
From: ruttur66 <112100490+RuthBenTov@users.noreply.github.com>
Date: Sun, 23 Jul 2023 19:31:08 +0300
Subject: [PATCH 3/3] ruth

---
 04-Typescript/22-git/admin style/dist/style.css | 6 +++++-
 04-Typescript/22-git/admin style/style.scss     | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/04-Typescript/22-git/admin style/dist/style.css b/04-Typescript/22-git/admin style/dist/style.css
index 6c4db7c88..c36cc07dd 100644
--- a/04-Typescript/22-git/admin style/dist/style.css	
+++ b/04-Typescript/22-git/admin style/dist/style.css	
@@ -1 +1,5 @@
-@i;
\ No newline at end of file
+<<<<<<< Updated upstream
+@i;
+=======
+@imp;
+>>>>>>> Stashed changes
diff --git a/04-Typescript/22-git/admin style/style.scss b/04-Typescript/22-git/admin style/style.scss
index 551e9b03f..4c6dc06e2 100644
--- a/04-Typescript/22-git/admin style/style.scss	
+++ b/04-Typescript/22-git/admin style/style.scss	
@@ -1 +1 @@
-@import "../features/inventory/dist/inventory.scc"
\ No newline at end of file
+@import "../features/inventory/dist/inventory.scc"