From 358e3a6e7f042fe17dd5e50986a6deb554cb4b78 Mon Sep 17 00:00:00 2001
From: "Jeffrey J. Bryan" <jbryan@google.com>
Date: Wed, 4 Feb 2015 20:37:34 -0800
Subject: [PATCH] Fix merge error.wq

---
 test/marker-basic.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/marker-basic.html b/test/marker-basic.html
index 0e07bba..56bae7d 100644
--- a/test/marker-basic.html
+++ b/test/marker-basic.html
@@ -41,6 +41,7 @@
     assert.isNull(markerEl.map);
     assert.isNull(markerEl.icon);
     assert.isNull(markerEl.info);
+    assert.equal(markerEl.zIndex, 0);
     assert.equal(markerEl.latitude, 37.779);
     assert.equal(markerEl.longitude, -122.3892);
     assert.isNull(markerEl.offsetParent,
@@ -52,6 +53,7 @@
       var markerEl = map.children[0];
       markerEl.latitude = 37.77493;
       markerEl.longitude = -122.41942;
+      markerEl.zIndex = 1;
 
       assert.equal(
           markerEl.map, map.map, "marker's map is not the google-map's");
@@ -59,6 +61,7 @@
       asyncPlatformFlush(function() {
         assert.equal(markerEl.marker.getPosition().lat(), markerEl.latitude);
         assert.equal(markerEl.marker.getPosition().lng(), markerEl.longitude);
+        assert.equal(markerEl.marker.getZIndex(), markerEl.zIndex);
 
         markerEl.icon = 'https://www.google.com/images/srpr/logo11w.png';
         asyncPlatformFlush(function() {