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

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

diff --git a/classes/Sms_carrier.php b/classes/Sms_carrier.php
index 5fb7417317a5a1ad03c8f20bf9e5136fe159544a..45bb29cffa5eeeaf4cd80f7356c2a0540e884cd7 100644 (file)
--- a/classes/Sms_carrier.php
+++ b/classes/Sms_carrier.php
@@ -4,7 +4,7 @@
  */
 require_once 'DB/DataObject.php';
 
-class Sms_carrier extends DB_DataObject 
+class Sms_carrier extends DB_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */