Manually resolve merge conflicts

Expensify · Jul 14, 2021 · fddf40a · fddf40a
1 parent 53fd87c
commit fddf40a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/src/languages/en.js b/src/languages/en.js
@@ -56,12 +56,9 @@ export default {
         send: 'Send',
         notifications: 'Notifications',
         noResultsFound: 'No results found',
-<<<<<<< HEAD
-=======
         deletedCommentMessage: 'Comment deleted',
         timePrefix: 'It\'s',
         conjunctionFor: 'for',
->>>>>>> 0639c6771 (Merge pull request #4020 from Expensify/Rory-FixUserTypingIndicator)
     },
     attachmentPicker: {
         cameraPermissionRequired: 'Camera Permission Required',

diff --git a/src/languages/es.js b/src/languages/es.js
@@ -52,12 +52,9 @@ export default {
         send: 'Enviar',
         notifications: 'Notificaciones',
         noResultsFound: 'No se han encontrado resultados',
-<<<<<<< HEAD
-=======
         deletedCommentMessage: 'Comentario borrado',
         timePrefix: 'Son las',
         conjunctionFor: 'para',
->>>>>>> 0639c6771 (Merge pull request #4020 from Expensify/Rory-FixUserTypingIndicator)
     },
     attachmentPicker: {
         cameraPermissionRequired: 'Se necesita permiso para usar la cámara',