Skip to content

Commit f344e51

Browse files
author
Emilio Loi
committedApr 30, 2013
Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db
1 parent 0704366 commit f344e51

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed
 

‎src/core/qgsvectordataprovider.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -328,24 +328,18 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
328328
*/
329329
QStringList errors();
330330

331-
<<<<<<< HEAD
332-
<<<<<<< HEAD
333331
/**
334332
* It returns false by default.
335333
* Must be implemented by providers that support saving and loading styles to db returning true
336334
*/
337335
virtual bool isSaveAndLoadStyleToDBSupported() { return false; }
338336

339-
=======
340337
signals:
341338
/** Is emitted, when editing has started */
342339
void editingStarted();
343340

344341
/** Is emitted, when editing stopped */
345342
void editingStopped();
346-
>>>>>>> f3842775a5147b7a8da1639a4bec667a769b7fac
347-
=======
348-
>>>>>>> 009ba1b995536ad9936991524ccd0f53a1a5b558
349343

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

0 commit comments

Comments
 (0)
Please sign in to comment.