Skip to content

bugzilla
bugzilla
Commit 53a865c2 authored by System Administrator's avatar System Administrator
Browse files
Options

[etersoft] Cherry-pick fa750493

parent 898a1e40
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
template/en/default/etersoft/timersplash.html.tmpl
View file @ 53a865c2
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
<script language="javascript" type="text/javascript" src="js/etersoft/timer_common.js?25_10_2017"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer_common.js?25_10_2017"></script>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script>
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script>
...@@ -55,3 +56,6 @@ ...@@ -55,3 +56,6 @@
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?24_02_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?24_02_2021"></script>
>>>>>>> 04a65e142 ([fix] #14867: fix remaining time recounting) >>>>>>> 04a65e142 ([fix] #14867: fix remaining time recounting)
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?10_11_2020"></script>
>>>>>>> fa750493b (Update scripts version)
template/ru/default/etersoft/timersplash.html.tmpl
View file @ 53a865c2
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
<script language="javascript" type="text/javascript" src="js/etersoft/timer_common.js?25_10_2017"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer_common.js?25_10_2017"></script>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script>
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script>
...@@ -55,3 +56,6 @@ ...@@ -55,3 +56,6 @@
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?24_02_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?24_02_2021"></script>
>>>>>>> 04a65e142 ([fix] #14867: fix remaining time recounting) >>>>>>> 04a65e142 ([fix] #14867: fix remaining time recounting)
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?10_11_2020"></script>
>>>>>>> fa750493b (Update scripts version)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment