This commit is contained in:
tiago.kayaya
2021-01-22 16:47:23 +01:00
221 changed files with 13905 additions and 13549 deletions
+2 -1
View File
@@ -7,7 +7,7 @@
<option name="testRunner" value="PLATFORM" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="C:/Gradle/gradle-6.6" />
<option name="gradleHome" value="$PROJECT_DIR$/../../../../../../Gradle/gradle-6.6" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
@@ -17,6 +17,7 @@
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
<option name="useQualifiedModuleNames" value="true" />
</GradleProjectSettings>
</option>
</component>
+330 -9
View File
@@ -15,6 +15,7 @@
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/executionHistory/executionHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.lock" afterDir="false" />
<<<<<<< HEAD
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<<<<<<< HEAD
<change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
@@ -33,10 +34,117 @@
<<<<<<< HEAD
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es5.js" afterDir="false" />
=======
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/resourceHashesCache.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/classAnalysis.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/jarAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/jarAnalysis.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/javaCompile.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/taskHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/debug.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/debug.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeProjectDexDebug/classes.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeProjectDexDebug/classes.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/dex_archive_input_jar_hashes/debug/out" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex_archive_input_jar_hashes/debug/out" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merger.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-cc-modal-add-participants-cc-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-cc-modal-add-participants-cc-modal-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-cc-modal-add-participants-cc-modal-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-cc-modal-add-participants-cc-modal-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-modal-add-participants-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-modal-add-participants-modal-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-modal-add-participants-modal-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-modal-add-participants-modal-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-modal-add-participants-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-modal-add-participants-modal-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-modal-add-participants-modal-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-modal-add-participants-modal-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es5.js.map" afterDir="false" />
>>>>>>> feature/pushNotifications
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es5.js.map" afterDir="false" />
<<<<<<< HEAD
=======
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-events-events-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-events-events-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-events-events-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-events-events-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-events-events-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-events-events-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-events-events-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-events-events-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/discart-expedient-modal-discart-expedient-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/discart-expedient-modal-discart-expedient-modal-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/discart-expedient-modal-discart-expedient-modal-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/discart-expedient-modal-discart-expedient-modal-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/discart-expedient-modal-discart-expedient-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/discart-expedient-modal-discart-expedient-modal-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/discart-expedient-modal-discart-expedient-modal-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/discart-expedient-modal-discart-expedient-modal-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/emend-message-modal-emend-message-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/emend-message-modal-emend-message-modal-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/emend-message-modal-emend-message-modal-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/emend-message-modal-emend-message-modal-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/emend-message-modal-emend-message-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/emend-message-modal-emend-message-modal-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/emend-message-modal-emend-message-modal-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/emend-message-modal-emend-message-modal-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/event-actions-popover-event-actions-popover-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/event-actions-popover-event-actions-popover-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/event-actions-popover-event-actions-popover-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/event-actions-popover-event-actions-popover-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/event-actions-popover-event-actions-popover-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/event-actions-popover-event-actions-popover-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/event-actions-popover-event-actions-popover-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/event-actions-popover-event-actions-popover-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expedient-task-modal-expedient-task-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expedient-task-modal-expedient-task-modal-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expedient-task-modal-expedient-task-modal-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expedient-task-modal-expedient-task-modal-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expedient-task-modal-expedient-task-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expedient-task-modal-expedient-task-modal-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expedient-task-modal-expedient-task-modal-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expedient-task-modal-expedient-task-modal-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-detail-expediente-detail-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-detail-expediente-detail-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-detail-expediente-detail-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-detail-expediente-detail-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-detail-expediente-detail-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-detail-expediente-detail-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-detail-expediente-detail-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-detail-expediente-detail-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-expediente-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-expediente-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-expediente-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-expediente-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-expediente-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-expediente-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-expediente-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-expediente-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/gallery-gallery-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/gallery-gallery-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/gallery-gallery-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/gallery-gallery-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/gallery-gallery-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/gallery-gallery-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/gallery-gallery-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/gallery-gallery-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es5.js.map" afterDir="false" />
>>>>>>> feature/pushNotifications
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es2015.js" afterDir="false" />
@@ -51,19 +159,38 @@
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es5.js.map" afterDir="false" />
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> feature/pushNotifications
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-events-events-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-events-events-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-events-events-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-events-events-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-events-events-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-events-events-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-events-events-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-events-events-module-es5.js.map" afterDir="false" />
<<<<<<< HEAD
=======
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es5.js.map" afterDir="false" />
>>>>>>> feature/pushNotifications
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js.map" afterDir="false" />
<<<<<<< HEAD
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es2015.js" afterDir="false" />
@@ -71,10 +198,130 @@
<change beforePath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/common-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/common-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/common-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/common-es5.js" afterDir="false" />
=======
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-publications-publications-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-publications-publications-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-publications-publications-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-publications-publications-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-publications-publications-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-publications-publications-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-publications-publications-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-publications-publications-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-seguinte-btn-seguinte-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-seguinte-btn-seguinte-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-seguinte-btn-seguinte-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-seguinte-btn-seguinte-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-seguinte-btn-seguinte-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-seguinte-btn-seguinte-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-seguinte-btn-seguinte-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-seguinte-btn-seguinte-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-header-pr-header-pr-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-header-pr-header-pr-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-header-pr-header-pr-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-header-pr-header-pr-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-header-pr-header-pr-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-header-pr-header-pr-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-header-pr-header-pr-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-header-pr-header-pr-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/styles-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/styles-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/styles-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/styles-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/styles-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/styles-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/styles-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/styles-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/out/resources-debug.ap_" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/out/resources-debug.ap_" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/52440b056b1aa7e444700e1b30e7ba04fc227da8465af2637304fa37124a40a4_0.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/52440b056b1aa7e444700e1b30e7ba04fc227da8465af2637304fa37124a40a4_1.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/52440b056b1aa7e444700e1b30e7ba04fc227da8465af2637304fa37124a40a4_2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/52440b056b1aa7e444700e1b30e7ba04fc227da8465af2637304fa37124a40a4_3.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/res/merged/debug/values_values.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/res/merged/debug/values_values.arsc.flat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/runtime_symbol_list/debug/R.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/runtime_symbol_list/debug/R.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-cc-modal-add-participants-cc-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-cc-modal-add-participants-cc-modal-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-cc-modal-add-participants-cc-modal-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-cc-modal-add-participants-cc-modal-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-modal-add-participants-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-modal-add-participants-modal-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-modal-add-participants-modal-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-modal-add-participants-modal-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-modal-add-participants-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-modal-add-participants-modal-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-modal-add-participants-modal-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-modal-add-participants-modal-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/common-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/common-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/common-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/common-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/common-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/common-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/common-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/common-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es5.js.map" afterDir="false" />
>>>>>>> feature/pushNotifications
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-chat-chat-module~pages-events-events-module~pages-login-login-module~~987a3ffe-es5.js.map" afterDir="false" />
<<<<<<< HEAD
=======
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-events-events-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-events-events-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-events-events-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-events-events-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-events-events-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-events-events-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-events-events-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-events-events-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/discart-expedient-modal-discart-expedient-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/discart-expedient-modal-discart-expedient-modal-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/discart-expedient-modal-discart-expedient-modal-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/discart-expedient-modal-discart-expedient-modal-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/discart-expedient-modal-discart-expedient-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/discart-expedient-modal-discart-expedient-modal-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/discart-expedient-modal-discart-expedient-modal-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/discart-expedient-modal-discart-expedient-modal-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/emend-message-modal-emend-message-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/emend-message-modal-emend-message-modal-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/emend-message-modal-emend-message-modal-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/emend-message-modal-emend-message-modal-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/emend-message-modal-emend-message-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/emend-message-modal-emend-message-modal-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/emend-message-modal-emend-message-modal-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/emend-message-modal-emend-message-modal-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/event-actions-popover-event-actions-popover-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/event-actions-popover-event-actions-popover-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/event-actions-popover-event-actions-popover-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/event-actions-popover-event-actions-popover-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/event-actions-popover-event-actions-popover-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/event-actions-popover-event-actions-popover-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/event-actions-popover-event-actions-popover-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/event-actions-popover-event-actions-popover-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/expedient-task-modal-expedient-task-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/expedient-task-modal-expedient-task-modal-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/expedient-task-modal-expedient-task-modal-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/expedient-task-modal-expedient-task-modal-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/expedient-task-modal-expedient-task-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/expedient-task-modal-expedient-task-modal-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/expedient-task-modal-expedient-task-modal-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/expedient-task-modal-expedient-task-modal-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/expediente-detail-expediente-detail-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/expediente-detail-expediente-detail-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/expediente-detail-expediente-detail-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/expediente-detail-expediente-detail-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/expediente-detail-expediente-detail-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/expediente-detail-expediente-detail-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/expediente-detail-expediente-detail-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/expediente-detail-expediente-detail-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/expediente-expediente-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/expediente-expediente-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/expediente-expediente-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/expediente-expediente-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/expediente-expediente-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/expediente-expediente-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/expediente-expediente-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/expediente-expediente-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/gallery-gallery-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/gallery-gallery-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/gallery-gallery-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/gallery-gallery-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/gallery-gallery-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/gallery-gallery-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/gallery-gallery-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/gallery-gallery-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es5.js.map" afterDir="false" />
>>>>>>> feature/pushNotifications
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/index-index-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/index-index-module-es2015.js" afterDir="false" />
@@ -97,19 +344,38 @@
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/main-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/main-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/main-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/main-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/main-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/main-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es5.js.map" afterDir="false" />
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> feature/pushNotifications
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-events-events-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-events-events-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-events-events-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-events-events-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-events-events-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-events-events-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-events-events-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-events-events-module-es5.js.map" afterDir="false" />
<<<<<<< HEAD
=======
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es5.js.map" afterDir="false" />
>>>>>>> feature/pushNotifications
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js.map" afterDir="false" />
<<<<<<< HEAD
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es2015.js" afterDir="false" />
@@ -117,13 +383,42 @@
=======
>>>>>>> feature/chat
<change beforePath="$PROJECT_DIR$/../src/environments/environment.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../src/environments/environment.ts" afterDir="false" />
=======
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-publications-publications-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-publications-publications-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-publications-publications-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-publications-publications-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-publications-publications-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-publications-publications-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-publications-publications-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-publications-publications-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-seguinte-btn-seguinte-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-seguinte-btn-seguinte-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-seguinte-btn-seguinte-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-seguinte-btn-seguinte-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-seguinte-btn-seguinte-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-seguinte-btn-seguinte-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-seguinte-btn-seguinte-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-seguinte-btn-seguinte-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-header-pr-header-pr-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-header-pr-header-pr-module-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-header-pr-header-pr-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-header-pr-header-pr-module-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-header-pr-header-pr-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-header-pr-header-pr-module-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-header-pr-header-pr-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-header-pr-header-pr-module-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/styles-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/styles-es2015.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/styles-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/styles-es2015.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/styles-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/styles-es5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/styles-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/styles-es5.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../src/app/home/home.page.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../src/app/home/home.page.ts" afterDir="false" />
>>>>>>> feature/pushNotifications
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<<<<<<< HEAD
<component name="ExecutionTargetManager" SELECTED_TARGET="XU020961" />
=======
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[XU020585]" />
>>>>>>> feature/pushNotifications
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
<ProjectState />
@@ -148,12 +443,17 @@
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showExcludedFiles" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<<<<<<< HEAD
<property name="DeviceAndSnapshotComboBoxAction.selectedDevice" value="Pixel_2_API_27" />
<property name="DeviceAndSnapshotComboBoxAction.selectionTime" value="2021-01-20T15:12:29.734Z" />
=======
<property name="DeviceAndSnapshotComboBoxAction.selectedDevice" value="32014983dd0a168b" />
<property name="DeviceAndSnapshotComboBoxAction.selectionTime" value="2021-01-20T12:48:24.302Z" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
>>>>>>> feature/pushNotifications
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="project.structure.last.edited" value="Dependencies" />
<property name="project.structure.proportion" value="0.17" />
@@ -174,6 +474,7 @@
<option name="DEPLOY_AS_INSTANT" value="false" />
<option name="ARTIFACT_NAME" value="" />
<option name="PM_INSTALL_OPTIONS" value="" />
<option name="ALL_USERS" value="false" />
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
<option name="ACTIVITY_EXTRA_FLAGS" value="" />
<option name="MODE" value="default_activity" />
@@ -209,11 +510,16 @@
</Native>
<Profilers>
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
<option name="STARTUP_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
<option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
<option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
</Profilers>
<option name="DEEP_LINK" value="" />
<option name="ACTIVITY_CLASS" value="" />
<option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
<option name="SKIP_ACTIVITY_VALIDATION" value="false" />
<method v="2">
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
</method>
@@ -232,6 +538,9 @@
</task>
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="oldMeFiltersMigrated" value="true" />
</component>
<component name="WindowStateProjectService">
<state x="496" y="-803" key="#PSD" timestamp="1610703919469">
<screen x="0" y="-1080" width="1920" height="1040" />
@@ -241,27 +550,39 @@
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="496" y="56" key="#app/0.0.1536.824/0.-1080.1920.1040@0.0.1536.824" timestamp="1610719107702" />
<state width="598" height="199" key="GridCell.Tab.0.bottom" timestamp="1610707055540">
<screen x="0" y="-1080" width="1920" height="1040" />
<state x="525" y="171" key="FileChooserDialogImpl" timestamp="1611151674810">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="525" y="171" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1611151674810" />
<state width="1340" height="335" key="GridCell.Tab.0.bottom" timestamp="1611154209550">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="598" height="199" key="GridCell.Tab.0.bottom/0.0.1536.824/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1610707055540" />
<state width="598" height="199" key="GridCell.Tab.0.center" timestamp="1610707055539">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="1340" height="335" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611154209550" />
<state width="1340" height="335" key="GridCell.Tab.0.center" timestamp="1611154209550">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="598" height="199" key="GridCell.Tab.0.center/0.0.1536.824/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1610707055539" />
<state width="598" height="199" key="GridCell.Tab.0.left" timestamp="1610707055539">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="1340" height="335" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611154209550" />
<state width="1340" height="335" key="GridCell.Tab.0.left" timestamp="1611154209549">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="598" height="199" key="GridCell.Tab.0.left/0.0.1536.824/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1610707055539" />
<state width="598" height="199" key="GridCell.Tab.0.right" timestamp="1610707055540">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="1340" height="335" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611154209549" />
<state width="1340" height="335" key="GridCell.Tab.0.right" timestamp="1611154209550">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="598" height="199" key="GridCell.Tab.0.right/0.0.1536.824/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1610707055540" />
<state width="1340" height="335" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611154209550" />
<state x="540" y="292" key="com.intellij.ide.util.TipDialog" timestamp="1610717874136">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="675" y="-711" key="com.intellij.ide.util.TipDialog/0.0.1536.824/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1610710840299" />
<state x="540" y="292" key="com.intellij.ide.util.TipDialog/0.0.1536.824/0.-1080.1920.1040@0.0.1536.824" timestamp="1610717874136" />
<state x="451" y="16" width="586" height="801" key="find.popup" timestamp="1611151620074">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="451" y="16" width="586" height="801" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611151620074" />
<state x="600" y="-792" key="psd.add.library.dependency.panel.dimension" timestamp="1610703821963">
<screen x="0" y="-1080" width="1920" height="1040" />
</state>