Removed merge conflicts

2017-10-30 16:20:53 +01:00
parent a64abe2cb1 3f150e0b32
commit 9d23816483
2 changed files with 16 additions and 8 deletions
--- a/index.html
+++ b/index.html
@ -392,6 +392,7 @@
            <input type="text" value="" size="35" maxlength="100" id="contactSubject" name="contactSubject" placeholder="Subject">
            <textarea cols="50" rows="15" maxlength="1500" id="contactMessage" name="contactMessage" placeholder="Message" style="resize: vertical; font-family: inherit; font-size: inherit"></textarea>
            <button
+<<<<<<< HEAD
 <<<<<<< HEAD
                class="g-recaptcha submit"
                data-sitekey="6Le7VisUAAAAAIn3TfNvR6srMLuVa6Xw09zojiIt">
@ -405,6 +406,13 @@
            <button class="submit">Submit</button>
 >>>>>>> 4e103ad9c58ff7d1bfd9fc105e027b54373dd96b
            <span id="image-loader">
+=======
+                class="g-recaptcha submit"
+                data-sitekey="6Le7VisUAAAAAIn3TfNvR6srMLuVa6Xw09zojiIt">
+              Submit
+            </button>
+            <span id="image-loader">
+>>>>>>> 3f150e0b32b08b003b615ffecbc75c143c6c63f7
              <img alt="" src="images/loader.gif">
            </span>
          </fieldset>