From df62ba88cb36535dde8eed795a0cb37a880b638e Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 24 Jan 2018 14:31:11 -0800
Subject: [PATCH] Fix rebase error

---
 interface/src/main.cpp                   | 1 -
 libraries/shared/src/shared/Crashpad.cpp | 1 -
 2 files changed, 2 deletions(-)

diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 253f152bb3..2b89c13ae7 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -61,7 +61,6 @@ int main(int argc, const char* argv[]) {
 
     // Instance UserActivityLogger now that the settings are loaded
     auto& ual = UserActivityLogger::getInstance();
-
     qDebug() << "UserActivityLogger is enabled:" << ual.isEnabled();
 
     if (ual.isEnabled()) {
diff --git a/libraries/shared/src/shared/Crashpad.cpp b/libraries/shared/src/shared/Crashpad.cpp
index 7bc3ce7584..cd5262a5b0 100644
--- a/libraries/shared/src/shared/Crashpad.cpp
+++ b/libraries/shared/src/shared/Crashpad.cpp
@@ -42,7 +42,6 @@ bool startCrashHandler() {
 
     annotations["token"] = BACKTRACE_TOKEN;
     annotations["format"] = "minidump";
-    annotations["service-name"] = BuildInfo::INTERFACE_NAME.toStdString();
     annotations["version"] = BuildInfo::VERSION.toStdString();
 
     arguments.push_back("--no-rate-limit");