Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pain.

git-svn-id: https://modestmaps.googlecode.com/svn/trunk/php@853 a23cadb0-8de1-11de-82e5-a1837a67dc72
  • Loading branch information...
commit bfb66dd6a704fbfe4fce28e5f3058446989a914e 2 parents 42f710b + 11c3015
migurski authored
Showing with 3 additions and 0 deletions.
  1. +3 −0  ModestMaps.php
View
3  ModestMaps.php
@@ -2,7 +2,10 @@
require_once 'Geo.php';
require_once 'Core.php';
+<<<<<<< HEAD
require_once 'Providers.php';
+=======
+>>>>>>> 11c30152b49ddd638411b01b6a0ee4f3b2559e4c
class Modest_Map
{
Please sign in to comment.
Something went wrong with that request. Please try again.