LesLibres.org/Rss-Bridge
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

MondeDiplo Conflict

Browse source
This commit is contained in:
Damien Calesse 2014-07-24 13:58:38 +02:00
parent ca1314c4ac
commit 8ff7d9460f
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bridges/MondeDiploBridge.php
View file

@ -60,8 +60,3 @@ class MondeDiploBridge extends BridgeAbstract{
return 21600; // 6 hours
}
}
<<<<<<< HEAD
=======
>>>>>>> bf2303ead8b6c8aa01a3e1c58ddd27cbc4fc2d71