Retirar os conflitos do git

admin/opcoes.php

@@ -53,7 +53,7 @@ function Acaogrupo_Asterisk($dbcon, $acaoDest, $org_id){
 
     $query = "SELECT * FROM pbx_grupos where org_id = $1 and numero = $2 order by id asc";
     pg_prepare($dbcon, "acao_grupo_asterisk", $query);
-    $result = pg_execute( $dbcon, "acao_grupo_asterisk", array($org_id, $acaoDest));
+    $result = pg_execute( $dbcon, "acao_voice_asterisk", array($org_id, $acaoDest));
 
     if( $result === false ){
         return false;
@@ -66,15 +66,9 @@ function Acaogrupo_Asterisk($dbcon, $acaoDest, $org_id){
 
 function AcaoFilas_Asterisk($dbcon, $acaoDest, $org_id){
 
-<<<<<<< HEAD
     $query = "SELECT numero_asterisk FROM pbx_queues_grupos where status='A' and org_id = $1 and numero = $2";
     pg_prepare($dbcon, "filas_asterisk", $query);
     $result = pg_execute( $dbcon, "filas_asterisk", array($org_id, $acaoDest));
-=======
-    $query = "SELECT numero FROM pbx_queues_grupos where status='A' and org_id = $1 and numero = $2";
-    pg_prepare($dbcon, "acao_filas_asterisk", $query);
-    $result = pg_execute( $dbcon, "acao_filas_asterisk", array($org_id, $acaoDest));
->>>>>>> eeef12d (Obter os valores da referência sql corretos)
 
     if( $result === false ){
         return false;
@@ -88,15 +82,9 @@ function AcaoFilas_Asterisk($dbcon, $acaoDest, $org_id){
 
 function AcaoHorarios_Asterisk($dbcon, $acaoDest, $org_id){
 
-<<<<<<< HEAD
     $query = "SELECT distinct a.id_asterisk from pbx_horarios a, pbx_horarios_itens b where a.org_id = $1 and a.org_id = b.org_id and b.id_horario = a.id and a.id = $2 order by nome asc";
     pg_prepare($dbcon, "horario_asterisk", $query);
     $result = pg_execute($dbcon, "horario_asterisk", array( $org_id, $acaoDest ));
-=======
-    $query = "SELECT distinct a.id from pbx_horarios a, pbx_horarios_itens b where a.org_id = $1 and a.org_id = b.org_id and b.id_horario = a.id and a.id = $2 order by nome asc";
-    pg_prepare($dbcon, "acao_horario_asterisk", $query);
-    $result = pg_execute($dbcon, "acao_horario_asterisk", array( $org_id, $acaoDest ));
->>>>>>> eeef12d (Obter os valores da referência sql corretos)
 
     if( $result === false ){
         return false;
@@ -109,15 +97,9 @@ function AcaoHorarios_Asterisk($dbcon, $acaoDest, $org_id){
 
 function AcaoDisa_Asterisk($dbcon, $acaoDest, $org_id){
 
-<<<<<<< HEAD
-    $query = "SELECT * FROM pbx_disa where org_id = $1 and numero = $2";
-    pg_prepare($dbcon, "disa_asterisk", $query);
-    $result = pg_execute($dbcon, "disa_asterisk", array( $org_id, $acaoDest ));
-=======
     $query = "SELECT numero FROM pbx_disa where org_id = $1 and numero = $2";
     pg_prepare($dbcon, "acao_disa_asterisk", $query);
     $result = pg_execute($dbcon, "acao_disa_asterisk", array( $org_id, $acaoDest ));
->>>>>>> eeef12d (Obter os valores da referência sql corretos)
 
     if( $result === false ){
         return false;
@@ -158,15 +140,9 @@ function AcaoConferencia_Asterisk($dbcon, $acaoDest, $org_id){
 
 function AcaoCallback_Asterisk($dbcon, $acaoDest, $org_id){
 
-<<<<<<< HEAD
     $query = "SELECT distinct id_asterisk, descricao FROM pbx_callback where org_id = $1 and id = $2 order by descricao";
     pg_prepare($dbcon, "callback_asterisk", $query);
     $result = pg_execute($dbcon, "callback_asterisk", array( $org_id, $acaoDest ));
-=======
-    $query = "SELECT distinct id, descricao FROM pbx_callback where org_id = $1 and id = $2 order by descricao";
-    pg_prepare($dbcon, "acao_callback_asterisk", $query);
-    $result = pg_execute($dbcon, "acao_callback_asterisk", array( $org_id, $acaoDest ));
->>>>>>> eeef12d (Obter os valores da referência sql corretos)
 
     if( $result === false ){
         return false;