Skip to content

Commit b025249

Browse files
authored
Conflict fixes (rappasoft#1708)
* Revert Changes * Fix styling --------- Co-authored-by: lrljoe <[email protected]>
1 parent 2068b86 commit b025249

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

CHANGELOG.md

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,6 @@
22

33
All notable changes to `laravel-livewire-tables` will be documented in this file
44

5-
## [v3.2.5] - UNRELEASED
6-
### New Features
7-
- Add setConfigurableArea by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1706
8-
- Add User prompt for missing inputs by @achyutkneupane in https://github.com/rappasoft/laravel-livewire-tables/pull/1681
9-
10-
### Bug Fixes
11-
- UI patch: toolbar fix for reordering by @itsLeonB in https://github.com/rappasoft/laravel-livewire-tables/pull/1690
12-
13-
### Tweaks
14-
- Adjust Workflow behaviour for PCOV by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1706
15-
- Updated nl language in https://github.com/rappasoft/laravel-livewire-tables/pull/1695 by @Jerimu
16-
- Updated nl language in https://github.com/rappasoft/laravel-livewire-tables/pull/1694 by @Jerimu
17-
185
## [v3.2.4] - 2024-03-01
196
### Bug Fixes
207
- Collapsing Columns fix when multiple tables are displayed on a page by @lrljoe
@@ -1173,4 +1160,4 @@ Ground Up Rebuild
11731160
[0.1.4]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.3...v0.1.4
11741161
[0.1.3]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.2...v0.1.3
11751162
[0.1.2]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.1...v0.1.2
1176-
[0.1.1]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.0...v0.1.1
1163+
[0.1.1]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.0...v0.1.1

src/LaravelLivewireTablesServiceProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class LaravelLivewireTablesServiceProvider extends ServiceProvider
1414
public function boot(): void
1515
{
1616

17-
AboutCommand::add('Rappasoft Laravel Livewire Tables', fn () => ['Version' => '3.2.5']);
17+
AboutCommand::add('Rappasoft Laravel Livewire Tables', fn () => ['Version' => '3.2.4']);
1818

1919
$this->mergeConfigFrom(
2020
__DIR__.'/../config/livewire-tables.php', 'livewire-tables'

0 commit comments

Comments
 (0)