funny merge blurg

package.h

@@ -48,19 +48,6 @@ class PLASMA_EXPORT Package
         explicit Package();
 
         /**
-<<<<<<< HEAD
-=======
-         * Construct a Package object
-         *
-         * @param packageRoot path to the package installation root
-         * @param package the name of the package
-         * @param structure the package structure describing this package
-         **/
-        Package(const QString &packageRoot, const QString &package,
-                PackageStructure::Ptr structure);
-
-        /**
->>>>>>> origin/master
           * Construct a Package object.
           *
           * @param packagePath full path to the package directory