Skip to content
Snippets Groups Projects
Commit 530ced42 authored by littletux89@gmail.com's avatar littletux89@gmail.com
Browse files

[*] Eliminated the merge conflict.

parent bd78547a
No related branches found
No related tags found
2 merge requests!59Features 2608,!51Features 2608
Pipeline #1430 passed with stage
in 20 minutes and 15 seconds