Update pantheon-desktop-shell-v1.xml

Author: leolost2605

protocol/pantheon-desktop-shell-v1.xml

@@ -111,14 +111,6 @@
         Tell the shell to keep the surface above on all workspaces
       </description>
     </request>
-<<<<<<< leolost/make-modal
-    <request name="make_modal">
-      <description summary="requests to make a surface system modal">
-        This will block all user input outside the surface and most system shortcuts.
-      </description>
-
-      <arg name="dim" type="uint" summary="1 to dim, 0 to not dim"/>
-=======
 
     <request name="make_centered">
       <description summary="requests to keep the surface centered">
@@ -127,14 +119,21 @@
       </description>
     </request>
 
+    <request name="make_modal">
+      <description summary="requests to make a surface system modal">
+        This will block all user input outside the surface and most system shortcuts.
+      </description>
+
+      <arg name="dim" type="uint" summary="1 to dim, 0 to not dim"/>
+    </request>
+
     <request name="focus">
       <description summary="request keyboard focus">
         Request keyboard focus, taking it away from any other window.
         Keyboard focus must always be manually be requested and is
         - in contrast to normal windows - never automatically granted
         by the compositor.
       </description>
->>>>>>> main
     </request>
   </interface>
 </protocol>