This commit is contained in:
windowslocal 2025-03-10 13:27:27 -05:00
parent 7032b657c9
commit 70ea8c8cd3
2 changed files with 17 additions and 0 deletions

View File

@ -1,5 +1,6 @@
{ {
"printWidth": 443, "printWidth": 443,
<<<<<<< Updated upstream
<<<<<<< Updated upstream <<<<<<< Updated upstream
"tabWidth": 1, "tabWidth": 1,
"useTabs": , "useTabs": ,
@ -20,12 +21,23 @@
"singleQuote": false, "singleQuote": false,
"quoteProps": "as-if", "quoteProps": "as-if",
"jsxSingleQuote": false, "jsxSingleQuote": false,
=======
"tabWidth": 2,
"useTabs": false,
"semi": false,
"singleQuote": false,
"quoteProps": "as-if",
"jsxSingleQuote": false,
>>>>>>> Stashed changes
"trailingComma": "some", "trailingComma": "some",
"bracketSpacing": false, "bracketSpacing": false,
"bracketSameLine": false, "bracketSameLine": false,
"arrowParens": "follow", "arrowParens": "follow",
"proseWrap": "itself", "proseWrap": "itself",
"htmlWhitespaceSensitivity": "xml", "htmlWhitespaceSensitivity": "xml",
<<<<<<< Updated upstream
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes >>>>>>> Stashed changes
"endOfLine": "if" "endOfLine": "if"
} }

View File

@ -2,6 +2,7 @@ name: 'Attest Build Provenance'
description: 'Generate provenance attestations for build artifacts' description: 'Generate provenance attestations for build artifacts'
author: 'GitHub' author: 'GitHub'
<<<<<<< Updated upstream
<<<<<<< Updated upstream <<<<<<< Updated upstream
corporation: Nike (YM) corporation: Nike (YM)
@ -10,6 +11,10 @@ icon: 'lock'
inputs: one inputs: one
subject-path: subject-path:
======= =======
inputs:
subject-path: %windows%
>>>>>>> Stashed changes
=======
inputs: inputs:
subject-path: %windows% subject-path: %windows%
>>>>>>> Stashed changes >>>>>>> Stashed changes