search

TIS2016 / Sportovy-klub

FSPH
1 stars 0 forks source link

Zápisník #49

Closed JaroFuska closed 7 years ago

JaroFuska commented 7 years ago

Pridaný zápisník

michalpuskel commented 7 years ago

prosim nemergujte toto zatial:

je tu strasne vela konfiktov... na to ze si iba pridaval nove veci

malo by to vyzerat idealne takto: https://github.com/TIS2016/Sportovy-klub/pull/51

ja sa pokusim manulane vypatrat zajtra kt veci si menil a proste to bud napojim cez dalsi branch alebo nwm...

skratka spojim to ale u seba lebo ako github pise "These conflicts are tooo complex to resolve in web editor" :D

michalpuskel commented 7 years ago

mergnute