Merge pull request #270 from PluginAndPartners/master

Release 5.0.0
mercadopago · Feb 24, 2021 · 1ee0a2d · 1ee0a2d
2 parents c9fa73f + fca2997
commit 1ee0a2d
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/index.php b/index.php
@@ -1,18 +1,14 @@
 <?php
-<<<<<<< HEAD
 /**
- * Part of Woo Mercado Pago Module
- * Author - Mercado Pago
- * Developer
- * Copyright - Copyright(c) MercadoPago [https://www.mercadopago.com]
- * License - https://www.gnu.org/licenses/gpl.html GPL version 2 or higher
- *
- * @package MercadoPago
- * @category Includes
- * @author Mercado Pago
- */
+* Part of Woo Mercado Pago Module
+* Author - Mercado Pago
+* Developer
+* Copyright - Copyright(c) MercadoPago [https://www.mercadopago.com]
+* License - https://www.gnu.org/licenses/gpl.html GPL version 2 or higher
+*
+* @package MercadoPago
+* @category Includes
+* @author Mercado Pago
+*/
 
 exit;
-=======
-// Silence is golden
->>>>>>> origin