Merge branch 'inst_rewrite' of https://github.com/Forkk/MultiMC5

Conflicts:
	data/instancemodel.cpp

1 files changed, 0 insertions, 22 deletions

diff --git a/data/stdinstance.cpp b/data/stdinstance.cpp
deleted file mode 100644
index 4618f5ca..00000000
--- a/data/stdinstance.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2013 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "stdinstance.h"
-
-StdInstance::StdInstance(QString rootDir, QObject* parent) : 
-	InstanceBase(rootDir, parent)
-{
-	
-}