diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-05-15 15:34:29 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-05-15 15:34:29 -0600 |
| commit | d466f674ad3878495ec0c395b47c2386d2e5f0f6 (patch) | |
| tree | b159bbc92bb3dadeee0cecd5bae4ed609bc43b91 | |
| parent | e6f41d2beff84f403542bf3038d322a3e3eb544a (diff) | |
| download | askbot-d466f674ad3878495ec0c395b47c2386d2e5f0f6.tar.gz askbot-d466f674ad3878495ec0c395b47c2386d2e5f0f6.tar.bz2 askbot-d466f674ad3878495ec0c395b47c2386d2e5f0f6.zip | |
fixed merge :-$
| -rw-r--r-- | askbot/deps/livesettings/models.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/askbot/deps/livesettings/models.py b/askbot/deps/livesettings/models.py index 13c2323b..71db8acf 100644 --- a/askbot/deps/livesettings/models.py +++ b/askbot/deps/livesettings/models.py @@ -131,7 +131,6 @@ class Setting(models.Model, CachedObjectMixin): self.cache_set() -<<<<<<< Updated upstream def cache_set(self, *args, **kwargs): val = kwargs.pop('value', self) key = self.cache_key(*args, **kwargs) @@ -139,8 +138,6 @@ class Setting(models.Model, CachedObjectMixin): length = getattr(settings, 'LIVESETTINGS_CACHE_TIMEOUT', settings.CACHE_TIMEOUT) cache_set(key, value=val, length=length) -======= ->>>>>>> Stashed changes class Meta: unique_together = ('site', 'group', 'key') @@ -181,7 +178,6 @@ class LongSetting(models.Model, CachedObjectMixin): super(LongSetting, self).save(force_insert=force_insert, force_update=force_update) self.cache_set() -<<<<<<< Updated upstream def cache_set(self, *args, **kwargs): val = kwargs.pop('value', self) key = self.cache_key(*args, **kwargs) @@ -189,8 +185,6 @@ class LongSetting(models.Model, CachedObjectMixin): length = getattr(settings, 'LIVESETTINGS_CACHE_TIMEOUT', settings.CACHE_TIMEOUT) cache_set(key, value=val, length=length) -======= ->>>>>>> Stashed changes class Meta: unique_together = ('site', 'group', 'key') |