Fixes: #2687 non-JS fallbacks should be removed (removing patch leftover)

ihtml/themes/default/msg_dialog.tpl

@@ -15,7 +15,6 @@
     {$s_Trace}
   </div>
   {/if}
->>>>>>> 2a41802... Fixes: #2687 non-JS fallbacks should be removed
 
   {if $i_Type == $smarty.const.INFO_DIALOG || $i_Type == $smarty.const.CONFIRM_DIALOG || $i_Type == $smarty.const.OK_CANCEL_DIALOG}
   <div id="e_layer{$i_ID}" class="infoMsgDialog" style="top:200px;left:200px;">
@@ -75,49 +74,4 @@
   <script type="text/javascript">
     focus_field('MSG_OK{$i_ID}');
   </script>
-
-<<<<<<< HEAD
-      <table style="z-index:250;width:100%; border-top: solid 1px #BBBBBB;" cellspacing=0 cellpadding=2 summary="" border=0>
-        <tr>
-          <td style="width:100%; padding:7px; padding-bottom:14px;">
-            {$s_Message}
-            <br>
-          </td>
-          {if $s_Trace != "" && $i_TraceCnt != 0}
-          <td style="width:20px; vertical-align:top; cursor:pointer;">
-            <div onClick="$('trace_{$i_ID}').toggle();"><u>Trace</u></div>
-          </td>
-          {/if}
-        </tr>
-        <tr>
-          {if $s_Trace != "" && $i_TraceCnt != 0}
-          <td colspan="3" align="center" style="border-top: solid 1px #BBBBBB;">
-          {else}
-          <td colspan="2" align="center" style="border-top: solid 1px #BBBBBB;">
-          {/if}
-    {if $i_Type == $smarty.const.ERROR_DIALOG || $i_Type == $smarty.const.WARNING_DIALOG || $i_Type == $smarty.const.INFO_DIALOG}
-            <input type="button" id="MSG_OK{$i_ID}" type="button" name="MSG_OK{$i_ID}"
-              onClick="next_msg_dialog();" value="{t}Ok{/t}">
-    {elseif $i_Type == $smarty.const.CONFIRM_DIALOG}
-            <input type="button" id="MSG_OK{$i_ID}" type="submit" name="MSG_OK{$i_ID}"
-              onClick="next_msg_dialog();" value="{t}Ok{/t}">
-            <input type="button" type="button" name="MSG_CANCEL{$i_ID}"
-              onClick="next_msg_dialog();" value="{t}Cancel{/t}">
-    {elseif $i_Type == $smarty.const.OK_CANCEL_DIALOG}
-            <input type="button" id="MSG_OK{$i_ID}" type="submit" name="MSG_OK{$i_ID}"
-              onClick="next_msg_dialog();" value="{t}Ok{/t}">
-            <input type="button" type="submit" name="MSG_CANCEL{$i_ID}"
-              onClick="next_msg_dialog();" value="{t}Cancel{/t}">
-    {/if}
-          </td>
-        </tr>
-      </table>
-      </div>
-    <script language="JavaScript" type="text/javascript">
-      focus_field('MSG_OK{$i_ID}');
-    </script>
-
-  {/if}
-=======
->>>>>>> 2a41802... Fixes: #2687 non-JS fallbacks should be removed
 {/if}