summaryrefslogtreecommitdiff
path: root/classes/Nonce.php
diff options
context:
space:
mode:
authorMike Cochrane <mikec@mikenz.geek.nz>2008-07-09 18:46:30 -0400
committerMike Cochrane <mikec@mikenz.geek.nz>2008-07-09 18:46:30 -0400
commit4b656f47dff2bd6eed4dcfad060b8434d052d883 (patch)
tree6acc353a739f712ecbca9d825dcb7fa16f429ff1 /classes/Nonce.php
parent67921b1c1871e881f71f8f15aa7fc9c2b11da64d (diff)
Merge conflicts and kill a whole lot of trailing whitespace on lines.
darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz
Diffstat (limited to 'classes/Nonce.php')
-rw-r--r--classes/Nonce.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/Nonce.php b/classes/Nonce.php
index 987e8d1e8..1a3f35868 100644
--- a/classes/Nonce.php
+++ b/classes/Nonce.php
@@ -4,7 +4,7 @@
*/
require_once 'DB/DataObject.php';
-class Nonce extends DB_DataObject
+class Nonce extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */