fixing merge conflict

This commit is contained in:
Raman 2019-09-20 12:25:10 -04:00
parent 0e94944723
commit 7587698738

View File

@ -109,7 +109,7 @@ class AndroidIngestModule(DataSourceIngestModule):
xender.XenderAnalyzer(), zapya.ZapyaAnalyzer(), shareit.ShareItAnalyzer(), xender.XenderAnalyzer(), zapya.ZapyaAnalyzer(), shareit.ShareItAnalyzer(),
line.LineAnalyzer(), whatsapp.WhatsAppAnalyzer(), line.LineAnalyzer(), whatsapp.WhatsAppAnalyzer(),
textnow.TextNowAnalyzer(), skype.SkypeAnalyzer(), viber.ViberAnalyzer(), textnow.TextNowAnalyzer(), skype.SkypeAnalyzer(), viber.ViberAnalyzer(),
fbmessenger.FBMessengerAnalyzer() fbmessenger.FBMessengerAnalyzer(),
sbrowser.SBrowserAnalyzer(), operabrowser.OperaAnalyzer(), sbrowser.SBrowserAnalyzer(), operabrowser.OperaAnalyzer(),
oruxmaps.OruxMapsAnalyzer(), oruxmaps.OruxMapsAnalyzer(),
installedapps.InstalledApplicationsAnalyzer()] installedapps.InstalledApplicationsAnalyzer()]