merging conflicts

--HG-- branch : Gsoc14-ryzomAppImprovements
2014-07-07 01:57:08 +05:30 · 2014-07-07 01:57:08 +05:30 · edfe73b1ec
commit edfe73b1ec
parent 931d18323b bf47b07fe0
2 changed files with 1 additions and 1 deletions
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/.plugincache.php.swp
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/.plugincache.php.swp
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/plugincache.php
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/plugincache.php
@ -1,4 +1,4 @@
-<?php
+ <?php

 /**
 * API for loading and interacting with plugins