mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-19 05:36:13 +00:00
removed merged conflicts
This commit is contained in:
parent
b59e3bdf9a
commit
296836f94a
1 changed files with 1 additions and 2 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue