Portlaoise club players who represent Laois in hurling and football are free again to play for their county after a deal was brokered in the row involving the club and the county board.
The board acknowledged there were issues within the county between club and inter-county fixtures and agreed there was merit to the Portlaoise club's arguement.
Clubs will get their inter-county stars for 13 days preparation ahead of championship matches but only when both Laois senior teams exit their respective competitions this summer.
The club had withdrawn its players from both the county football and hurling panels after the county board refused to postpone a club championship match last Friday week.
Portloaise withdrew from its first round match with St Joseph's to highlight what it felt was a lack of consideration given by the board to its preparations for the game.
The club claimed its county players were not made available in the two weeks prior to the game and were subsequently deducted two points for not fulfilling the fixture.
The match is not expected to be rescheduled.
Portlaoise sent a delegation to last night's county executive meeting and the board says it will now endeavour to give clubs adequate time to prepare for championship games.
A statement read: "(the county board) will endeavour to the best of their ability to give clubs adequate time to prepare for local championship games with particular emphasis on allowing clubs thirteen days preparation after Laois senior teams exit their respective championships.
"However CLG Laoise will continue to facilitate our senior panels with thirteen days preparation prior to their championship proper.
"CLG Laoise is aware and understands the current plight of players in the club versus county scenario and has particular sympathy for dual players and clubs.
"In order to address this issue and the fixture programme in general, CLG Laoise will adhere as far as is possible to the local fixture schedule outlined at the beginning of the year."
The Laois senior hurlers face Offaly in the Leinster championship this Sunday while the football side play either Wicklow or Carlow on June 4th.
Portlaoise have several representatives on both inter-county panels: hurlers Cahir Healy and Joe Phelan and footballers Aidan Fennelly, Colm Parkinson, Ian Fitzgerald and Brian McCormack.
Portlaoise secretary Peter O'Neill has called on the GAA to address the club versus county issues in other counties.