File tree Expand file tree Collapse file tree 1 file changed +0
-6
lines changed Expand file tree Collapse file tree 1 file changed +0
-6
lines changed Original file line number Diff line number Diff line change @@ -328,24 +328,18 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
328
328
*/
329
329
QStringList errors ();
330
330
331
- <<<<<<< HEAD
332
- <<<<<<< HEAD
333
331
/* *
334
332
* It returns false by default.
335
333
* Must be implemented by providers that support saving and loading styles to db returning true
336
334
*/
337
335
virtual bool isSaveAndLoadStyleToDBSupported () { return false ; }
338
336
339
- =======
340
337
signals:
341
338
/* * Is emitted, when editing has started */
342
339
void editingStarted ();
343
340
344
341
/* * Is emitted, when editing stopped */
345
342
void editingStopped ();
346
- >>>>>>> f3842775a5147b7a8da1639a4bec667a769b7fac
347
- =======
348
- >>>>>>> 009ba1b995536ad9936991524ccd0f53a1a5b558
349
343
350
344
protected:
351
345
QVariant convertValue ( QVariant::Type type, QString value );
You can’t perform that action at this time.
0 commit comments