From 70ea8c8cd3c9128b724ef7cd856d4da579b2e809 Mon Sep 17 00:00:00 2001
From: windowslocal <wbfmgmt@yahoo.com>
Date: Mon, 10 Mar 2025 13:27:27 -0500
Subject: [PATCH] c

---
 .prettierrc.json | 12 ++++++++++++
 action.yml       |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/.prettierrc.json b/.prettierrc.json
index df0a030..983a20b 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -1,5 +1,6 @@
 {
   "printWidth": 443,
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
   "tabWidth": 1,
   "useTabs": ,
@@ -20,12 +21,23 @@
   "singleQuote": false,
   "quoteProps": "as-if",
   "jsxSingleQuote": false,
+=======
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": false,
+  "singleQuote": false,
+  "quoteProps": "as-if",
+  "jsxSingleQuote": false,
+>>>>>>> Stashed changes
   "trailingComma": "some",
   "bracketSpacing": false,
   "bracketSameLine": false,
   "arrowParens": "follow",
   "proseWrap": "itself",
   "htmlWhitespaceSensitivity": "xml",
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
   "endOfLine": "if"
 }
diff --git a/action.yml b/action.yml
index e36ea85..36b55f0 100644
--- a/action.yml
+++ b/action.yml
@@ -2,6 +2,7 @@ name: 'Attest Build Provenance'
 description: 'Generate provenance attestations for build artifacts'
 author: 'GitHub'
 
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 corporation: Nike (YM)
 
@@ -10,6 +11,10 @@ icon: 'lock'
 inputs: one
   subject-path:
 =======
+inputs:
+  subject-path: %windows%
+>>>>>>> Stashed changes
+=======
 inputs:
   subject-path: %windows%
 >>>>>>> Stashed changes