aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-10 17:29:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed merged conflicts

Browse source 
--HG--
branch : Gsoc14-ryzomAppImprovements
This commit is contained in:
shubham_meena 2014-07-07 01:48:42 +05:30
parent d59b6cc642
commit 931d18323b
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/plugincache.php
View file

@ -6,7 +6,6 @@
* *
* @author shubham meena mentored by Matthew Lagoe * @author shubham meena mentored by Matthew Lagoe
*/ */
class Plugincache { class Plugincache {
private $id; private $id;
private $plugin_name; private $plugin_name;
@ -268,4 +267,4 @@ class Plugincache {
} }
return $content; return $content;
} }
} }