alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

funny merge blurg

Browse Source
This commit is contained in:
Aaron Seigo 2011-07-13 18:10:38 +02:00
parent 97682614dd
commit 9d48b83dc9
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
package.h
View File

@ -48,19 +48,6 @@ class PLASMA_EXPORT Package
explicit 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. * Construct a Package object.
* *
* @param packagePath full path to the package directory * @param packagePath full path to the package directory