Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge

Browse source
This commit is contained in:
james 2011-06-20 18:10:39 -04:00
parent 05dc48fa71
commit 965b96047a
1 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/models/Preference.php
View file

@ -188,7 +188,6 @@ class Application_Model_Preference
return $val; return $val;
} }
} }
<<<<<<< HEAD
public static function SetPhone($phone){ public static function SetPhone($phone){
Application_Model_Preference::SetValue("phone", $phone); Application_Model_Preference::SetValue("phone", $phone);
@ -351,8 +350,6 @@ class Application_Model_Preference
return Application_Model_Preference::GetValue("remindme"); return Application_Model_Preference::GetValue("remindme");
} }
=======
public static function SetWatchedDirectory($directory) { public static function SetWatchedDirectory($directory) {
Application_Model_Preference::SetValue("watched_directory", $directory); Application_Model_Preference::SetValue("watched_directory", $directory);
} }
@ -360,7 +357,5 @@ class Application_Model_Preference
public static function GetWatchedDirectory() { public static function GetWatchedDirectory() {
return Application_Model_Preference::GetValue("watched_directory"); return Application_Model_Preference::GetValue("watched_directory");
} }
>>>>>>> 898cdc64dc65c03d2ed6e3f3344b273df7c0d201
} }