Merge branch 'master' of https://github.com/drewm/mailchimp-api

# Conflicts: # composer.json
drewm · Feb 16, 2018 · 15a5b45 · 15a5b45
2 parents e4dc486 + e5ac3f1
commit 15a5b45
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/BatchTest.php b/tests/BatchTest.php
@@ -30,4 +30,4 @@ public function testNewBatch()
         $this->assertInstanceOf('DrewM\MailChimp\Batch', $Batch);
     }
 
-}
+}
diff --git a/tests/ListsTest.php b/tests/ListsTest.php
@@ -30,4 +30,4 @@ public function testGetLists()
         $this->assertArrayHasKey('lists', $lists);
     }
 
-}
+}