Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into renovate/jsoneditor-10.x
Browse files Browse the repository at this point in the history
# Conflicts:
#	Lombiq.JsonEditor/package.json
#	Lombiq.JsonEditor/pnpm-lock.yaml
  • Loading branch information
Piedone committed Dec 23, 2024
2 parents fa34292 + 9f4f902 commit d7a628d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Lombiq.JsonEditor/Lombiq.JsonEditor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="12.0.0" />
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="2.1.0" />
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="2.1.1" />
</ItemGroup>

<Import Condition="'$(NuGetBuild)' != 'true'" Project="..\..\..\Utilities\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions.targets" />
Expand Down

0 comments on commit d7a628d

Please sign in to comment.