Merge branch 'master' of https://github.com/kranack/rss-bridge

Conflicts: bridges/MondeDiploBridge.php
2014-07-24 13:53:24 +02:00 · 2014-07-24 13:53:24 +02:00 · ca1314c4ac
commit ca1314c4ac
parent c06343128a bf2303ead8
3 changed files with 6 additions and 0 deletions
--- a/bridges/MondeDiploBridge.php
+++ b/bridges/MondeDiploBridge.php
@ -61,3 +61,7 @@ class MondeDiploBridge extends BridgeAbstract{
    }
 }
        
+<<<<<<< HEAD
+=======
+
+>>>>>>> bf2303ead8b6c8aa01a3e1c58ddd27cbc4fc2d71
--- a/bridges/ScoopItBridge.php
+++ b/bridges/ScoopItBridge.php
@ -45,3 +45,4 @@ class ScoopItBridge extends BridgeAbstract{
        return 21600; // 6 hours
    }
 }
+
--- a/bridges/WhydBridge.php
+++ b/bridges/WhydBridge.php
@ -63,3 +63,4 @@ class WhydBridge extends BridgeAbstract{
 	}
 }

+