codervivek5
diff --git a/‎.DS_Store
-6 KB b/‎.DS_Store
-6 KB
diff --git a/‎Front-with-React/VigyBag/.eslintrc.cjs ‎.eslintrc.cjs b/‎Front-with-React/VigyBag/.eslintrc.cjs ‎.eslintrc.cjs
diff --git a/‎.eslintrc.js
-24 b/‎.eslintrc.js
-24
diff --git a/‎.gitignore
+38-5 b/‎.gitignore
+38-5
diff --git a/‎.lintstagedrc.json
-5 b/‎.lintstagedrc.json
-5
diff --git a/‎.prettierrc
-14 b/‎.prettierrc
-14
diff --git a/‎Android/.gitignore
-37 b/‎Android/.gitignore
-37
diff --git a/‎Android/app/.gitignore
-1 b/‎Android/app/.gitignore
-1
diff --git a/‎Android/app/build.gradle
-89 b/‎Android/app/build.gradle
-89
diff --git a/‎Android/app/proguard-rules.pro
-21 b/‎Android/app/proguard-rules.pro
-21
diff --git a/‎Android/app/src/androidTest/java/com/vigbag/android/ExampleInstrumentedTest.kt
-24 b/‎Android/app/src/androidTest/java/com/vigbag/android/ExampleInstrumentedTest.kt
-24
diff --git a/‎Android/app/src/main/AndroidManifest.xml
-30 b/‎Android/app/src/main/AndroidManifest.xml
-30
diff --git a/‎Android/app/src/main/java/com/vigbag/android/application/App.kt
-27 b/‎Android/app/src/main/java/com/vigbag/android/application/App.kt
-27
diff --git a/‎Android/app/src/main/java/com/vigbag/android/application/MainActivity.kt
-15 b/‎Android/app/src/main/java/com/vigbag/android/application/MainActivity.kt
-15
diff --git a/‎Android/app/src/main/java/com/vigbag/android/di/AppModule.kt
-20 b/‎Android/app/src/main/java/com/vigbag/android/di/AppModule.kt
-20
diff --git a/‎Android/app/src/main/java/com/vigbag/android/model/ChildItemDataClass.kt
-4 b/‎Android/app/src/main/java/com/vigbag/android/model/ChildItemDataClass.kt
-4
diff --git a/‎Android/app/src/main/java/com/vigbag/android/model/ParentItemDataClass.kt
-3 b/‎Android/app/src/main/java/com/vigbag/android/model/ParentItemDataClass.kt
-3
diff --git a/‎Android/app/src/main/java/com/vigbag/android/model/Product.kt
-3 b/‎Android/app/src/main/java/com/vigbag/android/model/Product.kt
-3
@@ -1,21 +1,54 @@
-<<<<<<< HEAD
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+# Runtime data
+*.pid
+*.seed
+*.pid.lock
+
+# Dependency directories
+node_modules
+.env
+env/
+dist
+dist-ssr
+
+# System files
+.DS_Store
+
+# IDEs and editors
 *.iml
 .gradle
 /local.properties
+/.idea
+.vscode/*
+!.vscode/extensions.json
+
+# Android/IntelliJ related
 /.idea/caches
 /.idea/libraries
 /.idea/modules.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+.gradle
+/local.properties
+
+# macOS specific
 .DS_Store
+
+# Other build and output directories
 /build
 /captures
 .externalNativeBuild
 .cxx
 local.properties
-=======
-env/
+
+# Python specific
 *.pyc
-node_modules
->>>>>>> edaa4e819b84ae9911826ac64e0b82493d43512b