Skip to content

Commit

Permalink
merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
lukegalbraithrussell committed Nov 1, 2024
2 parents 11bcaa1 + 9bcc680 commit e28085b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion docs/sidebars.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ const sidebars = {
'concepts/publishing-views',
],
},
'concepts/assistant',
'concepts/custom-steps',
{
type: 'category',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@slack/bolt",
"version": "4.0.1",
"version": "4.1.0",
"description": "A framework for building Slack apps, fast.",
"author": "Slack Technologies, LLC",
"license": "MIT",
Expand Down

0 comments on commit e28085b

Please sign in to comment.