Skip to content
Permalink
Browse files
Fixing HTML tags again.
  • Loading branch information
brycecurtis committed Apr 25, 2012
1 parent 4fdc417 commit d6b8a5874d58660885e59262b9428d3adf94317e
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
@@ -43,15 +43,9 @@ <h1>Display Other Content</h1>
</div>
<h2>Action</h2>
<div class="btn large" onclick="document.location='tel:5551212';" >Call 411</div>
<<<<<<< HEAD
<a href="mailto:bob@abc.org?subject=My Subject&body=This is the body.%0D%0ANew line." class="btn large">Send Mail</a>
<a href="sms:5125551234?body=The SMS message." class="btn large">Send SMS</a>
<a href="http://www.google.com" class="btn large">Load Web Site</a>
=======
<a href="mailto:bob@abc.org?subject=My Subject&body=This is the body.%0D%0ANew line." class="btn large">Send Mail</div>
<a href="sms:5125551234?body=The SMS message." class="btn large">Send SMS</div>
<a href="http://www.google.com" class="btn large">Load Web Site</div>
>>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
<!-- Need new URL -->
<!-- a href="http://handle.library.cornell.edu/control/authBasic/authTest/" class="btn large">Basic Auth: test/this</a -->
<a href="page2.html" hrefbad="page2.html?me=test" class="btn large">Load another PhoneGap page</a>
@@ -20,10 +20,6 @@ <h4>Name: <span id="name"> </span></h4>
<h4>Width: <span id="width"> </span>, Height: <span id="height">
</span>, Color Depth: <span id="colorDepth"></span></h4>
</div>
<<<<<<< HEAD
<div ><button class="backBtn" onclick="backHome();">Back</button></div>
=======
<div ><button onclick="history.back();">Back</button></div>
>>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
</body>
</html>

0 comments on commit d6b8a58

Please sign in to comment.