Merge conflicts and kill a whole lot of trailing whitespace on lines.

[quix0rs-gnu-social.git] / classes / Nonce.php

diff --git a/classes/Nonce.php b/classes/Nonce.php
index 987e8d1e85c1fd18b9573a3ef021d889787d5c2f..1a3f3586899e6a82a71081c98c12fb6e468e70ab 100644 (file)
--- 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 */