Fix conflicts

laracasts · Apr 28, 2015 · 83182ab · 83182ab
2 parents 8b5d123 + 9998bfc
commit 83182ab
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Extensions/IntegrationTrait.php b/src/Extensions/IntegrationTrait.php
@@ -65,7 +65,7 @@ public function setUp()
         parent::setUp();
 
         $this->callMethods(
-            $this->getAnnotations()->having('setUp')
+            $this->annotations()->having('setUp')
         );
     }
 
@@ -651,7 +651,7 @@ protected function loadPreferredConfigFile()
      *
      * @return AnnotationReader
      */
-    public function getAnnotations()
+    public function annotations()
     {
         if (! $this->annotations) {
             $this->annotations = new AnnotationReader($this);
@@ -691,7 +691,7 @@ protected function callMethods(array $methods)
     public function tearDown()
     {
         $this->callMethods(
-            array_reverse($this->getAnnotations()->having('tearDown'))
+            array_reverse($this->annotations()->having('tearDown'))
         );
     }