Fixed GitHub problems

imelgrat · Feb 25, 2018 · c215fbf · c215fbf
1 parent daa60b6
commit c215fbf
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 691 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,6 @@ google-time-zone
 [![Latest Stable Version](https://poser.pugx.org/imelgrat/google-time-zone/v/stable)](https://packagist.org/packages/imelgrat/google-time-zone)
 [![Total Downloads](https://poser.pugx.org/imelgrat/google-time-zone/downloads)](https://packagist.org/packages/imelgrat/google-time-zone)
 
-<<<<<<< HEAD
 A PHP wrapper for the Google Maps TimeZone API. 
 
 The Google Maps Time Zone API provides a simple interface to request the time zone for a location on the earth, as well as that location's time offset from UTC.
@@ -20,7 +19,6 @@ Developed by [Ivan Melgrati](https://imelgrat.me)
 A PHP wrapper for the Google Maps Time Zone API.
 
 Developed by [Ivan Melgrati](https://imelgrat.me) [![Twitter](https://img.shields.io/twitter/url/https/github.com/imelgrat/tab-collapse.svg?style=social)](https://twitter.com/imelgrat)
->>>>>>> origin/master
 
 Requirements
 ------------

diff --git a/composer.json b/composer.json
@@ -1,12 +1,8 @@
 {
     "name": "imelgrat/google-time-zone",
     "type": "library",
-<<<<<<< HEAD
     "version" : "1.4.0",
     "description": "A PHP wrapper for the Google Maps TimeZone API.",
-=======
-    "description": "A PHP wrapper for the Google Maps Time Zone API.",
->>>>>>> origin/master
     "keywords": ["google", "map", "maps", "gmap", "gmaps", "timezone", "time zone", "location"],
     "homepage": "https://github.com/imelgrat/google-time-zone",
     "license": "MIT",

diff --git a/docs/classes/GoogleMapsTimeZone.html b/docs/classes/GoogleMapsTimeZone.html
@@ -137,10 +137,10 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-275919849"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-847473159"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-275919849" class="accordion-body collapse in">
+            <div id="namespace-847473159" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
 
@@ -1759,7 +1759,7 @@ <h1><i class="icon-pushpin"></i></h1>
             <section class="row-fluid">
                 <section class="span10 offset1">
                     <hr />
-                    Documentation is powered by phpDocumentor and authored  by <a target="_blank" href="https://imelgrat.me">Iv&aacute;n Melgrati</a> on February 25th, 2018 at 19:46.
+                    Documentation is powered by phpDocumentor and authored  by <a target="_blank" href="https://imelgrat.me">Iv&aacute;n Melgrati</a> on February 25th, 2018 at 19:55.
                 </section>
             </section>
         </section>

diff --git a/docs/files/GoogleMapsTimeZone.html b/docs/files/GoogleMapsTimeZone.html
@@ -137,10 +137,10 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1948569854"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1384635733"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1948569854" class="accordion-body collapse in">
+            <div id="namespace-1384635733" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
 
@@ -249,7 +249,7 @@ <h1><i class="icon-pushpin"></i></h1>
             <section class="row-fluid">
                 <section class="span10 offset1">
                     <hr />
-                    Documentation is powered by phpDocumentor and authored  by <a target="_blank" href="https://imelgrat.me">Iv&aacute;n Melgrati</a> on February 25th, 2018 at 19:46.
+                    Documentation is powered by phpDocumentor and authored  by <a target="_blank" href="https://imelgrat.me">Iv&aacute;n Melgrati</a> on February 25th, 2018 at 19:55.
                 </section>
             </section>
         </section>

diff --git a/docs/files/GoogleMapsTimeZone.php.txt b/docs/files/GoogleMapsTimeZone.php.txt
@@ -574,4 +574,3 @@
 
 		}
 	}
-?>
diff --git a/docs/graphs/class.html b/docs/graphs/class.html
@@ -144,7 +144,7 @@ <h1><i class="icon-pushpin"></i></h1>
             <section class="row-fluid">
                 <section class="span10 offset1">
                     <hr />
-                    Documentation is powered by phpDocumentor and authored  by <a target="_blank" href="https://imelgrat.me">Iv&aacute;n Melgrati</a> on February 25th, 2018 at 19:46.
+                    Documentation is powered by phpDocumentor and authored  by <a target="_blank" href="https://imelgrat.me">Iv&aacute;n Melgrati</a> on February 25th, 2018 at 19:55.
                 </section>
             </section>
         </section>

diff --git a/docs/index.html b/docs/index.html
@@ -89,10 +89,10 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-537666511"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2040455533"></a>
                                 <a href="namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-537666511" class="accordion-body collapse in">
+            <div id="namespace-2040455533" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
 
@@ -169,7 +169,7 @@ <h1><i class="icon-pushpin"></i></h1>
             <section class="row-fluid">
                 <section class="span10 offset1">
                     <hr />
-                    Documentation is powered by phpDocumentor and authored  by <a target="_blank" href="https://imelgrat.me">Iv&aacute;n Melgrati</a> on February 25th, 2018 at 19:46.
+                    Documentation is powered by phpDocumentor and authored  by <a target="_blank" href="https://imelgrat.me">Iv&aacute;n Melgrati</a> on February 25th, 2018 at 19:55.
                 </section>
             </section>
         </section>

diff --git a/docs/namespaces/default.html b/docs/namespaces/default.html
@@ -89,10 +89,10 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1837064765"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1001321192"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1837064765" class="accordion-body collapse in">
+            <div id="namespace-1001321192" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
 
@@ -169,7 +169,7 @@ <h1><i class="icon-pushpin"></i></h1>
             <section class="row-fluid">
                 <section class="span10 offset1">
                     <hr />
-                    Documentation is powered by phpDocumentor and authored  by <a target="_blank" href="https://imelgrat.me">Iv&aacute;n Melgrati</a> on February 25th, 2018 at 19:46.
+                    Documentation is powered by phpDocumentor and authored  by <a target="_blank" href="https://imelgrat.me">Iv&aacute;n Melgrati</a> on February 25th, 2018 at 19:55.
                 </section>
             </section>
         </section>

diff --git a/docs/reports/deprecated.html b/docs/reports/deprecated.html
@@ -134,7 +134,7 @@ <h1><i class="icon-pushpin"></i></h1>
             <section class="row-fluid">
                 <section class="span10 offset1">
                     <hr />
-                    Documentation is powered by phpDocumentor and authored  by <a target="_blank" href="https://imelgrat.me">Iv&aacute;n Melgrati</a> on February 25th, 2018 at 19:46.
+                    Documentation is powered by phpDocumentor and authored  by <a target="_blank" href="https://imelgrat.me">Iv&aacute;n Melgrati</a> on February 25th, 2018 at 19:55.
                 </section>
             </section>
         </section>

diff --git a/docs/reports/errors.html b/docs/reports/errors.html
@@ -133,7 +133,7 @@ <h1><i class="icon-pushpin"></i></h1>
             <section class="row-fluid">
                 <section class="span10 offset1">
                     <hr />
-                    Documentation is powered by phpDocumentor and authored  by <a target="_blank" href="https://imelgrat.me">Iv&aacute;n Melgrati</a> on February 25th, 2018 at 19:46.
+                    Documentation is powered by phpDocumentor and authored  by <a target="_blank" href="https://imelgrat.me">Iv&aacute;n Melgrati</a> on February 25th, 2018 at 19:55.
                 </section>
             </section>
         </section>

diff --git a/docs/reports/markers.html b/docs/reports/markers.html
@@ -133,7 +133,7 @@ <h1><i class="icon-pushpin"></i></h1>
             <section class="row-fluid">
                 <section class="span10 offset1">
                     <hr />
-                    Documentation is powered by phpDocumentor and authored  by <a target="_blank" href="https://imelgrat.me">Iv&aacute;n Melgrati</a> on February 25th, 2018 at 19:46.
+                    Documentation is powered by phpDocumentor and authored  by <a target="_blank" href="https://imelgrat.me">Iv&aacute;n Melgrati</a> on February 25th, 2018 at 19:55.
                 </section>
             </section>
         </section>

diff --git a/examples/example-all-parameters.php b/examples/example-all-parameters.php
@@ -1,5 +1,4 @@
 <?php
-<<<<<<< HEAD
 	/**
      * This section includes a sample query that demonstrate features of the API.
      * The code below query performs a time zone request for Github's server (San Francisco, California, United States). The timestamp is set to March 8th, 2012. 
@@ -59,67 +58,4 @@
 	echo '<pre>';
 	var_dump($timezone_data);
 	echo '</pre>';
-?>
-=======
-
-/**
- * This section includes a sample query that demonstrate features of the API.
- * The code below query performs a time zone request for Github's server (San Francisco, California, United States). The timestamp is set to March 8th, 2012.
- *
- * @author    Ivan Melgrati
- * @copyright 2016
- * @package   GoogleMapsTimeZone
- * @author    Ivan Melgrati
- * @version   v1.2.0 stable
- */
-
-require_once('../src/GoogleMapsTimeZone.php');
-
-/**
- * All queries require an API key from Google.
- * @link https://developers.google.com/maps/documentation/timezone/get-api-key
- */
-define('API_KEY', 'YOUR API KEY HERE');
-
-// Create GoogleMapsTimeZone object with default properties.
-$timezone_object = new GoogleMapsTimeZone();
-
-// Set Google API key.
-$timezone_object->setApiKey(API_KEY);
-
-// Set XML as query return format.
-$timezone_object->setFormat($timezone_object::FORMAT_XML);
-
-// Set Spanish as query return language.
-// Check https://developers.google.com/maps/faq#languagesupport for a list of supported languages
-$timezone_object->setLanguage('es');
-
-// Set latitude (Mexico City International Airport).
-$timezone_object->setLatitude(19.4360812);
-
-// Set longitude (Mexico City International Airport).
-$timezone_object->setLongitude(-99.074097);
-
-// Set Timestamp (server-side current time).
-$timezone_object->setTimestamp(time());
-
-// Perform query
-$timezone_data = $timezone_object->queryTimeZone();
-
-echo '<pre>';
-print_r($timezone_data);
-echo '</pre>';
-
-// Set XML as query return format.
-$timezone_object->setFormat($timezone_object::FORMAT_JSON);
-// Set Arabic as query return language.
-// Checkhttps://developers.google.com/maps/faq#languagesupport for a list of supported languages
-$timezone_object->setLanguage('ar');
-
-// Perform query.
-$timezone_data = $timezone_object->queryTimeZone();
-
-echo '<pre>';
-var_dump($timezone_data);
-echo '</pre>';
->>>>>>> origin/master
+?>
diff --git a/examples/example-basic.php b/examples/example-basic.php
@@ -1,5 +1,4 @@
 <?php
-<<<<<<< HEAD
 	/**
      * This section includes a sample query that demonstrate features of the API.
      * The code below query performs a time zone request for Github's server (San Francisco, California, United States). The timestamp is set to March 8th, 2012. 
@@ -31,38 +30,4 @@
 	echo '<pre>';
 	print_r($timezone_data);
 	echo '</pre>';
-?>
-=======
-
-/**
- * This section includes a sample query that demonstrate features of the API.
- * The code below query performs a time zone request for Github's server (San Francisco, California, United States). The timestamp is set to March 8th, 2012.
- *
- * @author    Ivan Melgrati
- * @copyright 2016
- * @package   GoogleMapsTimeZone
- * @author    Ivan Melgrati
- * @version   v1.2.0 stable
- */
-
-require_once('../src/GoogleMapsTimeZone.php');
-
-/**
- * All queries require an API key from Google.
- * @link https://developers.google.com/maps/documentation/timezone/get-api-key
- */
-define('API_KEY', 'YOUR API KEY HERE');
-
-// Initialize GoogleMapsTimeZone object.
-$timezone_object = new GoogleMapsTimeZone(37.7697, -122.3933, 1331161200, GoogleMapsTimeZone::FORMAT_JSON);
-
-// Set Google API key.
-$timezone_object->setApiKey(API_KEY);
-
-// Perform query.
-$timezone_data = $timezone_object->queryTimeZone();
-
-echo '<pre>';
-print_r($timezone_data);
-echo '</pre>';
->>>>>>> origin/master
+?>