diff --git a/.gradle/6.5/fileHashes/fileHashes.bin b/.gradle/6.5/fileHashes/fileHashes.bin
index f1a9986..35e6424 100644
Binary files a/.gradle/6.5/fileHashes/fileHashes.bin and b/.gradle/6.5/fileHashes/fileHashes.bin differ
diff --git a/.gradle/6.5/fileHashes/fileHashes.lock b/.gradle/6.5/fileHashes/fileHashes.lock
index abcc778..81badaa 100644
Binary files a/.gradle/6.5/fileHashes/fileHashes.lock and b/.gradle/6.5/fileHashes/fileHashes.lock differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 2a1a85f..6f5810e 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 7875318..2720d93 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock
index 6532474..1e6e41d 100644
Binary files a/.gradle/checksums/checksums.lock and b/.gradle/checksums/checksums.lock differ
diff --git a/.gradle/checksums/md5-checksums.bin b/.gradle/checksums/md5-checksums.bin
new file mode 100644
index 0000000..af0ee3b
Binary files /dev/null and b/.gradle/checksums/md5-checksums.bin differ
diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin
new file mode 100644
index 0000000..5c543f0
Binary files /dev/null and b/.gradle/checksums/sha1-checksums.bin differ
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 23a89bb..a0de2a1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,18 +4,16 @@
diff --git a/.idea/libraries/Gradle__junit_junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml
index 6c078d6..f7d27c4 100644
--- a/.idea/libraries/Gradle__junit_junit_4_12.xml
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -1,5 +1,8 @@
+
+
+
diff --git a/.idea/libraries/Gradle__junit_junit_4_13_1.xml b/.idea/libraries/Gradle__junit_junit_4_13_1.xml
index 4405e64..4be8bb6 100644
--- a/.idea/libraries/Gradle__junit_junit_4_13_1.xml
+++ b/.idea/libraries/Gradle__junit_junit_4_13_1.xml
@@ -1,5 +1,8 @@
+
+
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d5d35ec..ef61796 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 95e9698..51a3536 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,6 +4,9 @@
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/NewsApp.iml b/.idea/modules/NewsApp.iml
index fc44a28..60506ed 100644
--- a/.idea/modules/NewsApp.iml
+++ b/.idea/modules/NewsApp.iml
@@ -1,13 +1,5 @@
-
-
-
-
-
-
-
-
diff --git a/.idea/modules/app/NewsApp.app.androidTest.iml b/.idea/modules/app/NewsApp.app.androidTest.iml
new file mode 100644
index 0000000..1c279e2
--- /dev/null
+++ b/.idea/modules/app/NewsApp.app.androidTest.iml
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+ generateDebugSources
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/app/NewsApp.app.iml b/.idea/modules/app/NewsApp.app.iml
index 86fa5b5..2099d5c 100644
--- a/.idea/modules/app/NewsApp.app.iml
+++ b/.idea/modules/app/NewsApp.app.iml
@@ -30,87 +30,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules/app/NewsApp.app.main.iml b/.idea/modules/app/NewsApp.app.main.iml
new file mode 100644
index 0000000..23267e8
--- /dev/null
+++ b/.idea/modules/app/NewsApp.app.main.iml
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+ generateDebugSources
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/app/NewsApp.app.unitTest.iml b/.idea/modules/app/NewsApp.app.unitTest.iml
new file mode 100644
index 0000000..a2e5b8c
--- /dev/null
+++ b/.idea/modules/app/NewsApp.app.unitTest.iml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+ generateDebugSources
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/project/newsapp/model/conflict.txt b/app/src/main/java/com/project/newsapp/model/conflict.txt
new file mode 100644
index 0000000..c85f045
--- /dev/null
+++ b/app/src/main/java/com/project/newsapp/model/conflict.txt
@@ -0,0 +1 @@
+merge not possible
diff --git a/app/src/main/java/com/project/newsapp/model/git.java b/app/src/main/java/com/project/newsapp/model/git.java
new file mode 100644
index 0000000..4b4ad8d
--- /dev/null
+++ b/app/src/main/java/com/project/newsapp/model/git.java
@@ -0,0 +1,27 @@
+package com.project.newsapp.model;
+
+public class git {
+ int roll;
+ String name;
+
+ public git(int roll, String name) {
+ this.roll = roll;
+ this.name = name;
+ }
+
+ public int getRoll() {
+ return roll;
+ }
+
+ public void setRoll(int roll) {
+ this.roll = roll;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/app/src/main/java/com/project/newsapp/model/git2.java b/app/src/main/java/com/project/newsapp/model/git2.java
new file mode 100644
index 0000000..9491bc3
--- /dev/null
+++ b/app/src/main/java/com/project/newsapp/model/git2.java
@@ -0,0 +1,18 @@
+package com.project.newsapp.model;
+
+public class git2 {
+ String dept;
+
+ public git2(String dept) {
+ this.dept = dept;
+ }
+
+ public String getDept() {
+ return dept;
+ }
+
+ public void setDept(String dept) {
+ this.dept = dept;
+ }
+}
+
diff --git a/local.properties b/local.properties
index 475eab1..946b8e1 100644
--- a/local.properties
+++ b/local.properties
@@ -1,10 +1,8 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file should *NOT* be checked into Version Control Systems,
+## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-sdk.dir=/Users/apple/Library/Android/sdk
\ No newline at end of file
+#Sat Mar 11 22:07:03 BDT 2023
+sdk.dir=C\:\\Users\\Lenovo\\AppData\\Local\\Android\\Sdk