Fixed conflicts

1 files changed, 2 insertions, 2 deletions

diff --git a/Db.php b/Db.php
index d80071a..f961614 100644
--- a/Db.php
+++ b/Db.php
@@ -54,7 +54,7 @@ class Db
    * Execute an SQL query
    * @return mixed
    */
-  public function query($sql, $data = null)
+  public static function query($sql, $data = null)
 	{
 	  if (!$data) {
       $data = array();
@@ -104,7 +104,7 @@ class Db
   
   }
   
-  public function fetch($sql, $data = null)
+  public static function fetch($sql, $data = null)
   {
     $stmt = self::query($sql, $data);
     return $stmt->fetchAll(PDO::FETCH_ASSOC);