Fix merge issue.

Polymer · Oct 8, 2015 · 85c23e1 · 85c23e1
1 parent 85d8a3a
commit 85c23e1
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/test/unit/notify-path.html b/test/unit/notify-path.html
@@ -1153,7 +1153,6 @@
     assert.strictEqual(el.array[3], 'orig3');
   });
 
-<<<<<<< HEAD
   test('link two objects', function() {
     var aChanged = 0;
     var bChanged = 0;