Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

removed merged conflicts

Browse source
This commit is contained in:
shubham_meena 2014-07-07 01:48:42 +05:30
parent b59e3bdf9a
commit 296836f94a
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;
} }
} }