Merge branch 'gh-pages' of https://github.com/SamWhited/GA-Shooting-R…

…anges into gh-pages Conflicts: index.html
wadamw · Feb 17, 2012 · 043cd11 · 043cd11
2 parents f920e76 + 14cf85f
commit 043cd11
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -3,3 +3,8 @@
 This project contains a **Keyhole Markup Language** (KML) file which contains information about shooting ranges in Georgia.
 
 It can be loaded into any viewer that supports KML files, including [Google Earth](https://www.google.com/earth/index.html).
+
+## Preview
+
+You can preview the file in [Google Maps](https://maps.google.com/maps?q=https://raw.github.com/wadamw/GA-Shooting-Ranges/master/WMA_Firearms_Ranges.kml),
+or at [wadamw.github.com/GA-Shooting-Ranges/](http://wadamw.github.com/GA-Shooting-Ranges/).
diff --git a/index.html b/index.html
@@ -4,9 +4,27 @@
 <head>
 	<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
 	<title>Georgia Shooting Ranges</title>
+<<<<<<< HEAD
 </head>
 
 <body>
+=======
+	<style type="text/css">
+		body {
+			font-family: 'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif;
+			color: #252519;
+		}
+	</style>
+</head>
+
+<body>
+	<a href="https://github.com/wadamw/GA-Shooting-Ranges">
+		<img style="position: absolute; top: 0; right: 0; border: 0;"
+		src="https://a248.e.akamai.net/assets.github.com/img/7afbc8b248c68eb468279e8c17986ad46549fb71/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6461726b626c75655f3132313632312e706e67"
+		alt="Fork me on GitHub"/>
+	</a>
+	<h1>Georgia Shooting Ranges</h1>
+>>>>>>> 14cf85f1bd75ab8f1010427cbb64470d910e18b8
 	<iframe width="640" height="480" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="http://maps.google.com/maps?f=q&amp;hl=en&amp;q=https:%2F%2Fraw.github.com%2Fwadamw%2FGA-Shooting-Ranges%2Fmaster%2FWMA_Firearms_Ranges.kml&amp;ie=UTF8&amp;t=h&amp;ll=33.017876,-83.166504&amp;spn=4.421146,7.03125&amp;z=7&amp;output=embed"></iframe><br /><small><a href="http://maps.google.com/maps?f=q&amp;hl=en&amp;q=https:%2F%2Fraw.github.com%2Fwadamw%2FGA-Shooting-Ranges%2Fmaster%2FWMA_Firearms_Ranges.kml&amp;ie=UTF8&amp;t=h&amp;ll=33.017876,-83.166504&amp;spn=4.421146,7.03125&amp;z=7&amp;source=embed" style="color:#0000FF;text-align:left">View Larger Map</a></small>
 </body>