removed merged conflicts

This commit is contained in:
shubham_meena 2014-07-07 01:48:42 +05:30
parent f130781223
commit 48cf2559de

View file

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