fix conflicts

2023-10-03 23:34:51 +03:00
parent 9350cdda48 48ad336bba
commit b791681d51
10 changed files with 21 additions and 13 deletions
@@ -189,6 +189,7 @@ MonoBehaviour:
  _descreiption: {fileID: 3870220567668916177}
  _sallary: {fileID: 2787096983671346797}
  _icon: {fileID: 5333122869086954718}
+  _button: {fileID: 7544413826500446465}
 --- !u!114 &9018781955098760075
 MonoBehaviour:
  m_ObjectHideFlags: 0