From 6871fda74dbb4f3ba5442e80cfe3ea913a0ac92c Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Tue, 8 Nov 2022 15:59:41 +0100
Subject: merge.

---
 Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml                | 4 ++--
 .../java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
index 62dda95..7ae9699 100644
--- a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
+++ b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
     <!--SVOJSTVA-->
 
     <uses-feature android:name="android.hardware.camera" android:required="true"></uses-feature>
-    
+
     <!--AKTIVNOSTI-->
     <application
         android:allowBackup="true"
@@ -65,7 +65,7 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-        
+
         <provider
             android:authorities="com.example.android.fileprovider"
             android:name="androidx.core.content.FileProvider"
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
index 6896267..82d2192 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
@@ -131,4 +131,4 @@ class ActivityCapturePost : AppCompatActivity() {
     }
 
 
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3