[sr-dev] lcr_mod.c corrupted

i don't know what happened, but when i pulled latest kamailio_3.0 branch, lcr_mod.c got this in it:

<<<<<<< HEAD static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) ======= static int load_gws(struct sip_msg* _m, fparam_t *_lcr_id, pv_spec_t* _from_uri)

...

...

...

...

...

> ef56e6b... lcr: fix load_gws() 2nd param

is it just me? perhaps i should re-pull the whole repo or something?

-- juha