From 7587698738cfb76f0705ea6ed66a720562c81df3 Mon Sep 17 00:00:00 2001
From: Raman <raman@basistech.com>
Date: Fri, 20 Sep 2019 12:25:10 -0400
Subject: [PATCH] fixing merge conflict

---
 InternalPythonModules/android/module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/InternalPythonModules/android/module.py b/InternalPythonModules/android/module.py
index 7c2d1f21ac..e5c90bc99e 100644
--- a/InternalPythonModules/android/module.py
+++ b/InternalPythonModules/android/module.py
@@ -109,7 +109,7 @@ class AndroidIngestModule(DataSourceIngestModule):
                      xender.XenderAnalyzer(), zapya.ZapyaAnalyzer(), shareit.ShareItAnalyzer(),
                      line.LineAnalyzer(), whatsapp.WhatsAppAnalyzer(), 
                      textnow.TextNowAnalyzer(), skype.SkypeAnalyzer(), viber.ViberAnalyzer(),
-                     fbmessenger.FBMessengerAnalyzer()
+                     fbmessenger.FBMessengerAnalyzer(),
                      sbrowser.SBrowserAnalyzer(), operabrowser.OperaAnalyzer(),
                      oruxmaps.OruxMapsAnalyzer(),
                      installedapps.InstalledApplicationsAnalyzer()]