Fixed conflicts

prs.mobile.new/PRS.Mobile.Droid/PRS.Mobile.Droid.csproj

@@ -25,15 +25,9 @@
         <DefineConstants>DEBUG;</DefineConstants>
         <ErrorReport>prompt</ErrorReport>
         <WarningLevel>4</WarningLevel>
-        <AndroidSupportedAbis>armeabi-v7a;arm64-v8a;x86_64</AndroidSupportedAbis>
-        <AndroidPackageFormat>apk</AndroidPackageFormat>
-        <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
         <AndroidLinkMode>None</AndroidLinkMode>
-<<<<<<< HEAD
-=======
         <AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis>
         <AndroidUseAapt2>true</AndroidUseAapt2>
->>>>>>> 3da6b40a07e76f26c8ce57e034ded0bdaed14f32
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
         <DebugSymbols>true</DebugSymbols>
@@ -56,11 +50,11 @@
     <ItemGroup>
         <PackageReference Include="Plugin.LocalNotification" Version="10.1.8" />
         <PackageReference Include="Resizetizer.NT" Version="0.3.0">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Syncfusion.Xamarin.SfPopupLayout" Version="22.1.37" />
-        <PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
+        <PackageReference Include="Xamarin.Android.Support.v4" Version="25.4.0.2" />
         <PackageReference Include="Xamarin.Essentials" Version="1.7.7" />
         <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
         <PackageReference Include="XF.Material" Version="1.8.0" />
@@ -85,22 +79,18 @@
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\..\inabox\InABox.Core\InABox.Core.csproj">
-          <Project>{cd727653-322b-4b8f-8bc0-86e6e85eb6f9}</Project>
-          <Name>InABox.Core</Name>
+            <Project>{cd727653-322b-4b8f-8bc0-86e6e85eb6f9}</Project>
+            <Name>InABox.Core</Name>
         </ProjectReference>
         <ProjectReference Include="..\..\..\inabox\InABox.Mobile\InABox.Mobile.Shared\InABox.Mobile.Shared.csproj">
-          <Project>{C4F5BF06-CAB8-47CF-8B0A-FF3406081781}</Project>
-          <Name>InABox.Mobile.Shared</Name>
+            <Project>{d7d34a5b-4aef-4aca-9867-9803556f0b07}</Project>
+            <Name>InABox.Mobile.Shared</Name>
         </ProjectReference>
         <ProjectReference Include="..\PRS.Mobile\PRS.Mobile.csproj">
             <Project>{2E807D8C-659F-464D-89FE-3889019BE8EA}</Project>
             <Name>PRS.Mobile</Name>
         </ProjectReference>
-        <ProjectReference Include="..\..\..\3rdpartylibs\pdfium-android\PdfiumAndroid\PdfiumAndroid\PdfiumAndroid.csproj">
-          <Project>{63845795-416F-4848-9DC1-63E992803D29}</Project>
-          <Name>PdfiumAndroid</Name>
-        </ProjectReference>
     </ItemGroup>
-    <Import Project="..\..\..\inabox\InABox.Mobile\InABox.Mobile.Android\InABox.Mobile.Android.projitems" Label="Shared" Condition="Exists('..\..\..\inabox\InABox.Mobile\InABox.Mobile.Android\InABox.Mobile.Android.projitems')" />
     <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-</Project>
+    <Import Project="..\..\..\inabox\InABox.Mobile\InABox.Mobile.Android\InABox.Mobile.Android.projitems" Label="Shared" />
+</Project>

prs.mobile.new/PRS.Mobile.Droid/Properties/AndroidManifest.xml

@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<<<<<<< HEAD
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="101300" android:versionName="1.01.3" package="comal.timesheets.android">
 	<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="30" />
-=======
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.PRS.Mobile">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
->>>>>>> 3da6b40a07e76f26c8ce57e034ded0bdaed14f32
 	<queries>
 		<intent>
 			<action android:name="android.media.action.IMAGE_CAPTURE" />