From 87dd24e1d60c649075c8b7524d061211038132fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Sat, 10 Sep 2022 16:38:16 +0200
Subject: [PATCH] Fix merge failure

---
 content/en/hugo-pipes/js.md | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/content/en/hugo-pipes/js.md b/content/en/hugo-pipes/js.md
index 9991a8a3c..f283b877c 100644
--- a/content/en/hugo-pipes/js.md
+++ b/content/en/hugo-pipes/js.md
@@ -40,7 +40,6 @@ Note that this is meant for small data sets, e.g. config settings. For larger da
 minify [bool]
 : Let `js.Build` handle the minification.
 
-<<<<<<< HEAD
 inject [slice] {{< new-in "0.81.0" >}}
 : This option allows you to automatically replace a global variable with an import from another file. The path names must be relative to `assets`.  See https://esbuild.github.io/api/#inject
 
@@ -71,16 +70,10 @@ With the above, these imports should work in both scenarios:
 import * as React from 'react'
 import * as ReactDOM from 'react-dom';
 ```
-sourceMap [string, bool] {{< new-in "0.75-DEV" >}}
+sourceMap [string, bool] {{< new-in "0.75.0" >}}
 : Let `js.Build` output sourceMap. Current only inline is supported. true defaults to inline.
-  One of: true, false, `inline`, `external`
-  Default is false
-=======
-sourceMap [string] {{< new-in "0.75-DEV" >}}
-: Let `js.Build` output sourceMap. Current only inline is supported.
-  One of: "", `inline`, `external`
-  Default is ""
->>>>>>> d280bedb7 (js.Build: Update docs to not allow boolean inputs for sourceMap)
+  One of: '`inline`, `external`
+  Default is "" (disabled)
 
 target [string]
 : The language target.