mirror of
https://github.com/wazuh/wazuh-kubernetes.git
synced 2025-12-10 00:38:21 -06:00
Resolvinmg conflicts
This commit is contained in:
parent
24c7df995e
commit
1263e076c6
@ -1,9 +1,4 @@
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
"version": "4.13.0",
|
||||
"stage": "rc4"
|
||||
=======
|
||||
"version": "4.13.1",
|
||||
"stage": "alpha0"
|
||||
>>>>>>> 71e728657210cf4e9bf996ecfa1e5c7d58a123ca
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user