From c781599c0d70ba60a5742b36723c06f137cce166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Thu, 19 May 2022 19:51:15 +0700
Subject: [PATCH] [merge] with upstream

---
 src/modules/fstab/fstab.conf | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/modules/fstab/fstab.conf b/src/modules/fstab/fstab.conf
index 5956218e6..1e87acddc 100644
--- a/src/modules/fstab/fstab.conf
+++ b/src/modules/fstab/fstab.conf
@@ -55,11 +55,7 @@ efiMountOptions: umask=0077
 # The standard configuration applies asynchronous discard support and ssd optimizations to btrfs
 # and does nothing for other filesystems.
 ssdExtraMountOptions:
-<<<<<<< HEAD
-    btrfs: discard=async,ssd
-=======
     btrfs: discard=async
->>>>>>> d5a79180e7f8e1fe6ecb986c93c22857ae2888bb
 
 # Additional options added to each line in /etc/crypttab
 crypttabOptions: luks