Merged

class/mailer.php

@@ -5,11 +5,7 @@
 class Mailer{
     private const FROM = "academia@lasalle.mx";
     private const FROM_NAME = "Vicerrectoría Académica";
-<<<<<<< HEAD
-    private const FROM_PASS = "D1s3c4nt3S1l1c4#$";//4c4d3m14S3gur4##  Foy25193 D1s3c4nt3S1l1c4#$
-=======
     private const FROM_PASS = "4c4d3m14S3gur4##";//Foy25193
->>>>>>> 7688f1aac1824c234bc5f19b154e9ad1f4808d4f
     private const FOOTER = "<p style='margin-top:5em; color:#aaa;font-style:italics'><small>Este es un correo automatizado, esta cuenta no recibe correos.<small></p>";
     //private $lista_to, $asunto, $texto;
 
@@ -99,8 +95,4 @@ class Mailer{
         return false;
     }
 
-<<<<<<< HEAD
-}
-=======
-}
->>>>>>> 7688f1aac1824c234bc5f19b154e9ad1f4808d4f
+}