Merge branch 'main' of github.com:ionic-team/ionic-docs into yourFirstAppVue

Author: thetaPC

docs/vue/your-first-app/7-live-reload.md

@@ -35,7 +35,11 @@ The Live Reload server will start up, and the native IDE of choice will open if
 
 ## Deleting Photos
 
+<<<<<<< HEAD
 With Live Reload running and the app open on your device, let’s implement photo deletion functionality.
+=======
+With Live Reload running and the app open on your device, let’s implement photo deletion functionality. In your code editor (not Android Studio or Xcode), open `Tab2Page.vue` then import the `actionSheetController`. We'll display an [IonActionSheet](https://ionicframework.com/docs/api/action-sheet) with the option to delete a photo:
+>>>>>>> c14530c8b4fa68a38b565e98b98f3d19f8339de0
 
 In `usePhotoGallery.ts`, add the `deletePhoto()` method. The selected photo is removed from the `photos` array first. Then, we delete the actual photo file itself using the Filesystem API.