removed merged conflicts

This commit is contained in:
shubham_meena 2014-07-07 01:48:42 +05:30
parent b59e3bdf9a
commit 296836f94a

View file

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