3.2.6 Merge Conflict Fixes (rappasoft#1731)

* Revert ChangeLog

* Revert Service Provider

* Fix styling

---------

Co-authored-by: lrljoe <[email protected]>

Author: lrljoe

CHANGELOG.md

@@ -2,18 +2,6 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
-## [v3.2.6] - UNRELEASED
-### New Features
-- Add configurable wire:model for filters by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1699
-- Customisable Model paths for Make command by @marvoh in https://github.com/rappasoft/laravel-livewire-tables/pull/1714
-
-### Bug Fixes
-- Fix error with DateColumn when empty by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1726
-
-### Tweaks
-- Migrate to PHPUnit Attributes rather than Doc Comments by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1727
-- Remove broken test by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1719
-
 ## [v3.2.5] - 2024-04-30
 ### New Features
 - Add setConfigurableArea by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1706

src/LaravelLivewireTablesServiceProvider.php

@@ -14,7 +14,7 @@ class LaravelLivewireTablesServiceProvider extends ServiceProvider
     public function boot(): void
     {
 
-        AboutCommand::add('Rappasoft Laravel Livewire Tables', fn () => ['Version' => '3.2.6']);
+        AboutCommand::add('Rappasoft Laravel Livewire Tables', fn () => ['Version' => '3.2.5']);
 
         $this->mergeConfigFrom(
             __DIR__.'/../config/livewire-tables.php', 'livewire-tables'