Skip to content
Permalink
Browse files

QgsVectorDataProvider without diff comments

  • Loading branch information
Emilio Loi
Emilio Loi committed Apr 30, 2013
1 parent d6b3bfa commit db3bfa37a32fef2b5d5b7f26c191d9eb1f140458
Showing with 2 additions and 11 deletions.
  1. +2 −11 src/core/qgsvectordataprovider.h
@@ -328,11 +328,7 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
*/
QStringList errors();

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a6cba64ec5ef59a35d60403c495bf1075514216

/**
* It returns false by default.
* Must be implemented by providers that support saving and loading styles to db returning true
@@ -345,12 +341,7 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider

/** Is emitted, when editing stopped */
void editingStopped();
<<<<<<< HEAD
=======
>>>>>>> f3842775a5147b7a8da1639a4bec667a769b7fac
=======
>>>>>>> 009ba1b995536ad9936991524ccd0f53a1a5b558
>>>>>>> 8a6cba64ec5ef59a35d60403c495bf1075514216


protected:
QVariant convertValue( QVariant::Type type, QString value );

0 comments on commit db3bfa3

Please sign in to comment.
You can’t perform that action at this time.