Remove accidental merge conflict in subscription (#122)

Author: erik-edling

src/main/resources/templates/subscription.html

@@ -188,7 +188,6 @@ <h3 class="modal-title text-center" id="formHeader">Subscription Form</h3>
                                        <tr>
                                            <td valign="top">
                                                <input data-bind="textInput:$data.formkey, onChange" name="formkey" placeholder="Key" class="form-control"
->>>>>>> 12cfe8e... Fix grouping of subscription elements
                                                     type="text" />
                                            </td>
                                            <td>