From b91c13fcb529767f18e0b3716880d46e2bcba396 Mon Sep 17 00:00:00 2001
From: Fernando Amezcua <fernandoamz148@gmail.com>
Date: Wed, 17 Nov 2021 10:58:47 -0600
Subject: [PATCH] Fix merge changes

---
 app/config/locale/codes.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/config/locale/codes.php b/app/config/locale/codes.php
index 2e1502943e..628ad831c8 100644
--- a/app/config/locale/codes.php
+++ b/app/config/locale/codes.php
@@ -37,15 +37,11 @@ return [
     'kn', // Kannada
     'km', // Khmer
     'ko', // Korean
-<<<<<<< HEAD
     'la', // Latin
-    'lt', // Lithuanian
-=======
     'lb', // Luxembourgish
     'lt', // Lithuanian
     'la', // Latin
     'lv', // Latvian
->>>>>>> 09d2ed9586c390ab66221848c871df130ae7916e
     'ml', // Malayalam
     'mr', // Marathi
     'ms', // Malay