Update config-essential-mata.aarch64

3772bb64 · laserbeamh · Avery Dorgan · bf479e12 · 3772bb64
Commit 3772bb64 authored 4 years ago by laserbeamh Committed by Avery Dorgan 4 years ago
--- 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