settingView: fixed conflict

Author: Kelly Pham

db/deleteAllTasks.sql

@@ -0,0 +1 @@
+DELETE FROM tasks WHERE parent_card_id = $1

db/deleteCard.sql

@@ -0,0 +1 @@
+DELETE FROM cards WHERE id = $1

db/editCard.sql

@@ -0,0 +1,3 @@
+UPDATE cards
+SET title = $1 
+WHERE id = $2

db/getAllCards2.sql

@@ -0,0 +1 @@
+SELECT * FROM cards WHERE parent_project_id = $1 ORDER BY id

db/getTasks.sql

@@ -0,0 +1 @@
+SELECT * FROM tasks WHERE parent_project_id = $1