Merge branch 'master' into fscherf/fix-draft-deletion-bug

django-cms · Feb 12, 2024 · 4f3497c · 4f3497c
2 parents a6e0896 + 57d08ea
commit 4f3497c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -31,5 +31,4 @@ repos:
     rev: v4.5.0
     hooks:
     -   id: check-yaml
-    -   id: end-of-file-fixer
     -   id: trailing-whitespace
diff --git a/djangocms_alias/templates/djangocms_alias/default/alias.html b/djangocms_alias/templates/djangocms_alias/default/alias.html
@@ -1 +1 @@
-{% load djangocms_alias_tags %}{% render_alias instance.alias %}
+{% load djangocms_alias_tags %}{% render_alias instance.alias %}
diff --git a/djangocms_alias/test_utils/text/templates/text/text.html b/djangocms_alias/test_utils/text/templates/text/text.html
@@ -1 +1 @@
-{{ instance.body|safe }}
+{{ instance.body|safe }}
diff --git a/tests/templates/djangocms_alias/custom_alias_template/alias.html b/tests/templates/djangocms_alias/custom_alias_template/alias.html
@@ -1 +1 @@
-{% load djangocms_alias_tags %}<b>{% render_alias instance.alias %}</b>
+{% load djangocms_alias_tags %}<b>{% render_alias instance.alias %}</b>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{% load djangocms_alias_tags %}{% render_alias instance.alias %}
		{% load djangocms_alias_tags %}{% render_alias instance.alias %}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{% load djangocms_alias_tags %}<b>{% render_alias instance.alias %}</b>
		{% load djangocms_alias_tags %}<b>{% render_alias instance.alias %}</b>