[libgda: 16/17] DB: Fixing documentation and merge leftover

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 87394041e21686b8213afc3425febb4c9cbbae8d
Author: Pavlo Solntsev <p sun fun gmail com>
Date:   Fri Nov 1 14:57:01 2019 -0500

    DB: Fixing documentation and merge leftover

 libgda/gda-db-index.c | 2 +-
 libgda/gda-db-table.c | 2 +-
 libgda/gda-db-view.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/libgda/gda-db-index.c b/libgda/gda-db-index.c
index 1b827fff5..46ca576a4 100644
--- a/libgda/gda-db-index.c
+++ b/libgda/gda-db-index.c
@@ -193,7 +193,7 @@ gda_db_index_remove_field (GdaDbIndex *self,
  *
  * This function is thread safe, that is, @cnc will be locked.
  *
- * Returns: (transfer none): A list of #GdaDbIndexField
+ * Returns: (transfer none) (nullable) (element-type Gda.DbIndexField): A list of #GdaDbIndexField
  */
 GSList *
 gda_db_index_get_fields (GdaDbIndex *self)
diff --git a/libgda/gda-db-table.c b/libgda/gda-db-table.c
index 63ef5d502..bdb80371d 100644
--- a/libgda/gda-db-table.c
+++ b/libgda/gda-db-table.c
@@ -1052,6 +1052,7 @@ on_error:
 
   return FALSE;
 }
+
 /**
  * gda_db_table_add_index:
  * @self: object to use
@@ -1180,4 +1181,3 @@ gda_db_table_append_constraint (GdaDbTable *self,
 
   priv->mp_constraint = g_slist_append (priv->mp_constraint, g_strdup (constr));
 }
->>>>>>> 0bbb2b518... Merge branch 'wip/ddl-check' into 'master'
diff --git a/libgda/gda-db-view.c b/libgda/gda-db-view.c
index c61415876..57c3c214a 100644
--- a/libgda/gda-db-view.c
+++ b/libgda/gda-db-view.c
@@ -459,7 +459,7 @@ gda_db_view_set_replace (GdaDbView *self,
  * gda_db_view_create:
  * @self: a #GdaDbView instance
  * @cnc: open connection for the operation
- * @ifnoexists: if set to %TRUE, the view will be created using IF NOT EXISTS flag
+ * @ifnotexists: if set to %TRUE, the view will be created using IF NOT EXISTS flag
  * @error: error container
  *
  * This method performs CREATE_VIEW operation over @cnc using data stored in @self