From 3772bb64065e297db759dca61484d76037cf0233 Mon Sep 17 00:00:00 2001
From: laserbeamh <avery.dorgan@protonmail.com>
Date: Mon, 27 Apr 2020 21:21:57 +0000
Subject: [PATCH] Update config-essential-mata.aarch64

---
 .../linux-essential-mata/config-essential-mata.aarch64        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/device/testing/linux-essential-mata/config-essential-mata.aarch64 b/device/testing/linux-essential-mata/config-essential-mata.aarch64
index 12bcbf7c713..80ab7294f29 100644
--- a/device/testing/linux-essential-mata/config-essential-mata.aarch64
+++ b/device/testing/linux-essential-mata/config-essential-mata.aarch64
@@ -4417,10 +4417,14 @@ CONFIG_TMPFS_XATTR=y
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 <<<<<<< HEAD
+<<<<<<< HEAD
 CONFIG_CONFIGFS_FS=m
 =======
 CONFIG_CONFIGFS_FS=y
 >>>>>>> Upload New File
+=======
+CONFIG_CONFIGFS_FS=m
+>>>>>>> Update config-essential-mata.aarch64
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
-- 
GitLab