2023-12-19 15:29:38 +01:00
|
|
|
<<<<<<< HEAD
|
2023-12-12 14:02:15 +01:00
|
|
|
E:\tomAIto_git\tomAIto\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\63.stamp
|
2023-12-19 15:29:38 +01:00
|
|
|
=======
|
2023-12-19 14:23:45 +01:00
|
|
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\63\jl\res\xml\xamarin_essentials_fileprovider_file_paths.xml
|
2023-12-19 15:29:38 +01:00
|
|
|
>>>>>>> origin/master
|
