removed merged conflicts

--HG-- branch : Gsoc14-ryzomAppImprovements
11 years ago · 931d18323b
parent d59b6cc642
commit 931d18323b
1 changed files with 1 additions and 2 deletions
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/plugincache.php
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/plugincache.php
@ -6,7 +6,6 @@
 * 
 * @author shubham meena mentored by Matthew Lagoe 
 */
 class Plugincache {
    private $id;
     private $plugin_name;