Fixing the n-dash in search result pages

computate-org · Oct 14, 2024 · 85bf3d9 · 85bf3d9
1 parent a129550
commit 85bf3d9
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/main/java/org/computate/frFR/java/EcrirePageClasse.java b/src/main/java/org/computate/frFR/java/EcrirePageClasse.java
@@ -3776,11 +3776,8 @@ else if(classeApiMethode.contains(i18nPage.getString(I18n.var_PUTCopie)))
 			tl(9, "</sl-button>");
 			tl(8, "</sl-tooltip>");
 			tl(7, "</sl-button-group>");
-<<<<<<< HEAD
 			tl(6, "<div>{{ pagination.", i18nPage.getString(I18n.var_debut), "Num }} – {{ pagination.", i17nPage.getString(I18n.var_fin), "Num }} ", i18nPage.getString(I18n.var_de), " {{ pagination.", i18nPage.getString(I18n.var_numTrouve), " }}</div>");
-=======
 			tl(6, "<div>{{ pagination.", i18nPage.getString(I18n.var_debut), "Num }} – {{ pagination.", i18nPage.getString(I18n.var_fin), "Num }} ", i18nPage.getString(I18n.var_de), " {{ pagination.", i18nPage.getString(I18n.var_numTrouve), " }}</div>");
->>>>>>> 63789dbc4cf085fe82d3466282b34af4606fba32
 			tl(6, "</div>");
 			tl(0, "{%- endmacro htm", i18nPage.getString(I18n.var_BoutonsPagination), classePageNomSimple, "() %}");