Merge branch 'main' of https://github.com/bernskioldmedia/laravel-ppt

# Conflicts: # src/Branding/ParagraphStyle.php # src/Presentation/BaseSlide.php # src/Presentation/Presentation.php
bernskiold · Dec 29, 2023 · d7aa6a5 · d7aa6a5
2 parents 5f9949b + fea784a
commit d7aa6a5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/Branding/ParagraphStyle.php b/src/Branding/ParagraphStyle.php
@@ -7,7 +7,6 @@
 use BernskioldMedia\LaravelPpt\Concerns\Slides\WithFontSettings;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Traits\Conditionable;
-use Illuminate\Support\Traits\Tappable;
 use function method_exists;
 
 /**

diff --git a/src/Presentation/BaseSlide.php b/src/Presentation/BaseSlide.php
@@ -15,9 +15,9 @@
 use BernskioldMedia\LaravelPpt\Concerns\Slides\WithTextColor;
 use BernskioldMedia\LaravelPpt\Contracts\Slide as SlideContract;
 use Closure;
-use Illuminate\Support\Traits\Tappable;
 use function config;
 use Illuminate\Support\Traits\Conditionable;
+use Illuminate\Support\Traits\Tappable;
 use PhpOffice\PhpPresentation\Slide;
 use PhpOffice\PhpPresentation\Slide\Background\Color;
 use function tap;

diff --git a/src/Presentation/Presentation.php b/src/Presentation/Presentation.php
@@ -7,11 +7,11 @@
 use BernskioldMedia\LaravelPpt\Concerns\Slides\WithPadding;
 use BernskioldMedia\LaravelPpt\Concerns\Slides\WithSize;
 use BernskioldMedia\LaravelPpt\Contracts\CustomizesPowerpointBranding;
-use Illuminate\Support\Traits\Conditionable;
-use Illuminate\Support\Traits\Tappable;
 use function config;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Traits\Conditionable;
+use Illuminate\Support\Traits\Tappable;
 use function method_exists;
 use PhpOffice\PhpPresentation\DocumentLayout;
 use PhpOffice\PhpPresentation\Exception\OutOfBoundsException;