From 48cf2559deb578699b27b6412a379c92b6c6bf7a Mon Sep 17 00:00:00 2001
From: shubham_meena <devnull@localhost>
Date: Mon, 7 Jul 2014 01:48:42 +0530
Subject: [PATCH] removed merged conflicts

---
 .../tools/server/ryzom_ams/ams_lib/autoload/plugincache.php    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/plugincache.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/plugincache.php
index 42bdda045..b056c02bb 100644
--- 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;
@@ -268,4 +267,4 @@ class Plugincache {
             } 
         return $content;
          } 
-    } 
+    } 
\ No newline at end of file