Remote Control Code : fix merge Conflict

diff --combined configure.ac
index de3fa09,ee8130b..f4068cb
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -211,8 -211,8 +211,10 @@@ lib/python/Plugins/SystemPlugins/Manual
  lib/python/Plugins/SystemPlugins/ManualFancontrol/meta/Makefile
  lib/python/Plugins/SystemPlugins/Blindscan/Makefile
  lib/python/Plugins/SystemPlugins/Blindscan/meta/Makefile
 +lib/python/Plugins/SystemPlugins/RemoteControlCode/Makefile
 +lib/python/Plugins/SystemPlugins/RemoteControlCode/meta/Makefile
+ lib/python/Plugins/SystemPlugins/WebBrowser/Makefile
+ lib/python/Plugins/SystemPlugins/WebBrowser/meta/Makefile
  lib/python/Tools/Makefile
  lib/service/Makefile
  lib/components/Makefile

diff --combined lib/python/Plugins/SystemPlugins/Makefile.am
index feadb2d,86802b0..0caab12
--- 1/lib/python/Plugins/SystemPlugins/Makefile.am
--- 2/lib/python/Plugins/SystemPlugins/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Makefile.am
@@@ -5,7 -5,7 +5,7 @@@ SUBDIRS = SoftwareManager Frontprocesso
        DefaultServicesScanner NFIFlash DiseqcTester CommonInterfaceAssignment \
        CrashlogAutoSubmit CleanupWizard VideoEnhancement WirelessLan NetworkWizard \
        TempFanControl FactoryTest Fancontrol FPGAUpgrade WirelessLanSetup ManualFancontrol \
-       Blindscan RemoteControlCode
 -      Blindscan WebBrowser
++      Blindscan WebBrowser RemoteControlCode 
  
  install_PYTHON =      \
        __init__.py