updates due to merge issues

Affirm · Mar 8, 2018 · 7be8a66 · 7be8a66
1 parent d2bd1d4
commit 7be8a66
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/extension/app/code/community/Affirm/Affirm/Model/Adminhtml/Observer.php b/extension/app/code/community/Affirm/Affirm/Model/Adminhtml/Observer.php
@@ -3,19 +3,17 @@ class Affirm_Affirm_Model_Adminhtml_Observer
 {
     /**
      * Predispatch action controller
+     * @param Varien_Event_Observer $observer
      */
-    public function preDispatch()
+    public function preDispatch(Varien_Event_Observer $observer)
     {
-        Mage::log(__METHOD__);
         /* @var $session Mage_Admin_Model_Session */
         $session = Mage::getSingleton('admin/session');
         if ($session->isLoggedIn()) {
-            $feedModel = Mage::getModel(
-                'affirm/feed'
-            );
+            $feedModel = Mage::getModel('affirm/feed');
             /* @var $feedModel Mage_AdminNotification_Model_Feed */
             $feedModel->checkUpdate();
         }
     }
-    
+
 }