mattmcw
/
these-3-words
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve merge conflict.

This commit is contained in:
Kevin Dungs 2014-11-18 16:18:49 +01:00
parent 1a445cdc0c 96275a1a7e
commit 658a40a09f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
views/index.html
View File

@ -21,9 +21,12 @@
<p class="lead"> <p class="lead">
Find a location anywhere in the world identified by three simple words. Find a location anywhere in the world identified by three simple words.
</p> </p>
<p class="text-warning">This is a very early pre-alpha release. Don't expect anything to work properly or reproducible. Especially since the underlying word-list will most likely change soon.</p> <p class="text-warning">This is hot off the press. We are still
finalising the word list so locations might not be
reproducible. So do not use it to mark the location of your
antarctic resupply drop quite yet!</p>
<p id="input3wordsContainer"> <p id="input3wordsContainer">
<input type="text" class="form-control" id="input3words" placeholder="spitting-ripple-fontanel"> <input type="text" class="form-control" id="input3words" placeholder="Your address OR opulent-crusade-zaar">
</p> </p>
<p> <p>
<button id="button3words" class="btn btn-lg btn-primary">Find on Map</button> <button id="button3words" class="btn btn-lg btn-primary">Find on Map</button>