fix conflicts

unepwcmc · Jan 13, 2020 · 3cbc675 · 3cbc675
2 parents 072e2b3 + 5258a01
commit 3cbc675
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/app/assets/images/icons/circle-chevron-green.svg b/app/assets/images/icons/circle-chevron-green.svg
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -263,7 +263,7 @@ def link_to_page? card
   def get_agile_config_themes
     {
       navButtons: true,
-      infinite: false,
+      infinite: true,
       responsive: [
       {
           breakpoint: 628,