removed merged conflicts
--HG-- branch : Gsoc14-ryzomAppImprovements
This commit is contained in:
parent
d59b6cc642
commit
931d18323b
1 changed files with 1 additions and 2 deletions
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue