Remove nsplugin, merged into mozilla_plugin
This commit is contained in:
parent
5305bd3265
commit
4ad2743642
@ -933,24 +933,6 @@ ntop = module
|
||||
nslcd = module
|
||||
|
||||
# Layer: apps
|
||||
<<<<<<< HEAD
|
||||
||||||| merged common ancestors
|
||||
# Module: nsplugin
|
||||
#
|
||||
# Policy for nspluginwrapper
|
||||
#
|
||||
nsplugin = module
|
||||
|
||||
# Layer: apps
|
||||
=======
|
||||
# Module: nsplugin
|
||||
#
|
||||
# Policy for nspluginwrapper
|
||||
#
|
||||
#nsplugin = module
|
||||
|
||||
# Layer: apps
|
||||
>>>>>>> 51bad8c183c97b813d9b5250ab04c5bb2a3c45f8
|
||||
# Module: mplayer
|
||||
#
|
||||
# Policy for Mozilla and related web browsers
|
||||
|
Loading…
Reference in New Issue
Block a user