From 7275c40cd325818e526935b45caf0e3e2c17a15a Mon Sep 17 00:00:00 2001 From: Artem Pelenitsyn Date: Sat, 3 Aug 2024 19:41:31 -0400 Subject: [PATCH] Update cabal-install-solver synopsis (fix #10183) (#10192) * Update cabal-install-solver synopsis (fix #10183) * fixup! remove trailing dot --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> (cherry picked from commit 5f766d2866769f4978d52f784cdacc1655547ac3) # Conflicts: # cabal-install-solver/cabal-install-solver.cabal --- cabal-install-solver/cabal-install-solver.cabal | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal index 8eb28299099..d22c6024304 100644 --- a/cabal-install-solver/cabal-install-solver.cabal +++ b/cabal-install-solver/cabal-install-solver.cabal @@ -1,9 +1,14 @@ cabal-version: 2.2 name: cabal-install-solver +<<<<<<< HEAD version: 3.12.1.0 synopsis: The command-line interface for Cabal and Hackage. +======= +version: 3.13.0.0 +synopsis: The solver component of cabal-install +>>>>>>> 5f766d286 (Update cabal-install-solver synopsis (fix #10183) (#10192)) description: - The solver component used in cabal-install command-line program + The solver component used in the cabal-install command-line program. homepage: http://www.haskell.org/cabal/ bug-reports: https://github.com/haskell/cabal/issues