mirror of
https://github.com/YunoHost-Apps/phpmyadmin_ynh.git
synced 2024-09-03 19:56:46 +02:00
Cleaning of sync with updated branch
This commit is contained in:
parent
a52962dd86
commit
ae4b6cc55b
1 changed files with 0 additions and 4 deletions
|
@ -1,5 +1 @@
|
|||
<<<<<<< HEAD
|
||||
4.4.11
|
||||
=======
|
||||
4.6.3
|
||||
>>>>>>> cdf71f3fb6106bec9648b110eddceb6859a50902
|
||||
|
|
Loading…
Reference in a new issue