From 0236bc0c4484c818266cb7ac720da072614e585e Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 10 May 2018 09:51:45 -0700
Subject: [PATCH] Cleanup after merge conflict

---
 interface/src/ui/Snapshot.cpp | 2 +-
 interface/src/ui/Snapshot.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/src/ui/Snapshot.cpp b/interface/src/ui/Snapshot.cpp
index 73d83ec6f7..af0b599c1a 100644
--- a/interface/src/ui/Snapshot.cpp
+++ b/interface/src/ui/Snapshot.cpp
@@ -333,7 +333,7 @@ QTemporaryFile* Snapshot::saveTempSnapshot(QImage image) {
     return static_cast<QTemporaryFile*>(savedFileForSnapshot(image, true));
 }
 
-QFile* Snapshot::savedFileForSnapshot(QImage & shot, bool isTemporary, const QString& userSelectedFilename) {
+QFile* Snapshot::savedFileForSnapshot(QImage & shot, bool isTemporary, const QString& userSelectedFilename, const QString& userSelectedPathname) {
 
     // adding URL to snapshot
     QUrl currentURL = DependencyManager::get<AddressManager>()->currentPublicAddress();
diff --git a/interface/src/ui/Snapshot.h b/interface/src/ui/Snapshot.h
index 47469bdf0b..dca4a54ba9 100644
--- a/interface/src/ui/Snapshot.h
+++ b/interface/src/ui/Snapshot.h
@@ -17,6 +17,7 @@
 #include <QString>
 #include <QStandardPaths>
 #include <QUrl>
+#include <QTimer>
 
 #include <SettingHandle.h>
 #include <DependencyManager.h>
@@ -62,7 +63,6 @@ private:
                                        bool isTemporary,
                                        const QString& userSelectedFilename = QString(),
                                        const QString& userSelectedPathname = QString());
-
     static QString snapshotFilename;
     static bool cubemapOutputFormat;
     static QTimer snapshotTimer;