Resolve merge conflict

remote-release-notes/images/1_42/forwarded-ports.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:02c736629bec3d8ccd72ee27d8f990aadaece8041f3a6dcfe579e1af9f11a5e3
+size 19034

remote-release-notes/v1_42.md

@@ -14,6 +14,8 @@ Piping content to the `code` launch command now also works in the Integrated Ter
 
 The Remote Explorer has a single port forwarding view that the SSH and Containers extension have adopted. From the Port Forwarding view you can see the ports you have currently forwarded through VS Code, forward additional ports, label forwarded ports, and copy the local address. You can also see suggested ports to forward based on what processes are currently running. If you want to have your forwarded ports restored when you open the same folder or workspace again, set the `remote.restoreForwardedPorts` setting to `true`.
 
+![Forwarded Ports view](images/1_42/forwarded-ports.png)
+
 ## SSH
 
 ### Auto-detect remote OS