From d5ad3a8a7051bf4f6f280d9c1ee8df872274e13a Mon Sep 17 00:00:00 2001
From: Klaas Freitag <freitag@owncloud.com>
Date: Mon, 22 Jul 2013 09:47:15 +0200
Subject: [PATCH] Removed mistakenly checked in file.

---
 src/mirall/settingsdialog.h.orig | 63 --------------------------------
 1 file changed, 63 deletions(-)
 delete mode 100644 src/mirall/settingsdialog.h.orig

diff --git a/src/mirall/settingsdialog.h.orig b/src/mirall/settingsdialog.h.orig
deleted file mode 100644
index 9816c023a..000000000
--- a/src/mirall/settingsdialog.h.orig
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) by Daniel Molkentin <danimo@owncloud.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- */
-
-#ifndef SETTINGSDIALOG_H
-#define SETTINGSDIALOG_H
-
-#include <QDialog>
-#include <QStyledItemDelegate>
-
-class QStandardItemModel;
-class QListWidgetItem;
-
-namespace Mirall {
-
-namespace Ui {
-class SettingsDialog;
-}
-class AccountSettings;
-
-class SettingsDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit SettingsDialog(QWidget *parent = 0);
-    ~SettingsDialog();
-
-    void addAccount(const QString &title, QWidget *widget);
-    
-public slots:
-    // Progress, parameter is
-    //  - filename
-    //  - progress bytes, overall size.
-    void slotFolderUploadProgress( const QString&, const QString&, long, long );
-
-private slots:
-    void handleItemClick(int);
-    void checkResetToOldItem(QListWidgetItem*, QListWidgetItem*);
-    void asyncSwitch(int);
-
-<<<<<<< HEAD
->>>>>>> Add settings skeleton
-=======
->>>>>>> 96bc26da77b7080335bbb3c7199e14e308364e94
-private:
-    Ui::SettingsDialog *_ui;
-    QListWidgetItem *_addItem;
-    AccountSettings *_accountSettings;
-};
-
-}
-
-#endif // SETTINGSDIALOG_H