removed merged conflicts

--HG--
branch : Gsoc14-ryzomAppImprovements
This commit is contained in:
shubham_meena 2014-07-07 01:48:42 +05:30
parent d59b6cc642
commit 931d18323b

View file

@ -6,7 +6,6 @@
*
* @author shubham meena mentored by Matthew Lagoe
*/
class Plugincache {
private $id;
private $plugin_name;