Fix incorrect left is LOCAL, right is REMOTE ordering

Why: From the Git history, it looks like LOCAL and REMOTE were swapped
by accident in a refactor of the original shell script this is based on.
When I ported that to Vimscript the output was identical between the two
and I missed the mistake yet again.

Closes #14. Thanks to @jmandawg for the catch!

Author: whiteinge

plugin/diffconflicts.vim

@@ -28,15 +28,15 @@ function! s:diffconfl()
     silent execute "read #". l:origBuf
     1delete
     silent execute "file RCONFL"
-    silent execute "g/^=======\\r\\?$/,/^>>>>>>> /d"
-    silent execute "g/^<<<<<<< /d"
+    silent execute "g/^<<<<<<< /,/^=======\\r\\?$/d"
+    silent execute "g/^>>>>>>> /d"
     setlocal nomodifiable readonly buftype=nofile bufhidden=delete nobuflisted
     diffthis
 
     " Set up the left-hand side.
     wincmd p
-    silent execute "g/^<<<<<<< /,/^=======\\r\\?$/d"
-    silent execute "g/^>>>>>>> /d"
+    silent execute "g/^=======\\r\\?$/,/^>>>>>>> /d"
+    silent execute "g/^<<<<<<< /d"
     diffthis
 endfunction