Skip to content

Commit

Permalink
Merge branch '7.x' into 8.x
Browse files Browse the repository at this point in the history
Signed-off-by: Mior Muhammad Zaki <[email protected]>

# Conflicts:
#	.gitignore
#	composer.json
#	tests/Unit/Presets/PackageTest.php
  • Loading branch information
crynobone committed Aug 21, 2023
2 parents de99b0a + cb721f7 commit c656ab9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tests/Unit/Presets/PackageTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Orchestra\Canvas\Core\Tests\Presets;
namespace Orchestra\Canvas\Core\Tests\Unit\Presets;

use Illuminate\Filesystem\Filesystem;
use Orchestra\Canvas\Core\Presets\Package;
Expand Down

0 comments on commit c656ab9

Please sign in to comment.