fred-jehle-spanish-verbs icon indicating copy to clipboard operation
fred-jehle-spanish-verbs copied to clipboard

Published 20 hours ago • verified publisher icon ghidinelli

Fixed Imperative in .csv file, resorted the verbs

Open dcomtois opened this issue 7 years ago • 8 comments

dcomtois avatar Jan 19 '18 04:01 dcomtois

Ah, bummer. I had a feeling these two PRs would conflict. I will need to look at this in more detail later before I can merge to master.

ghidinelli avatar Jan 25 '18 14:01 ghidinelli

@dcomtois there's this one too but there is a conflict in place at the moment?

ghidinelli avatar Jun 26 '18 03:06 ghidinelli

Correct me if I'm wrong, but the 1st person singular is missing here for imperativo positivo. (I think that's where the conflicts arise)

dcomtois avatar Jun 26 '18 22:06 dcomtois

@dcomtois It's saying there's a merge conflict. You may need to merge the main repo since the json addition

lkwilson avatar Jun 27 '19 21:06 lkwilson

@dcomtois Hey there do you plan on rebasing the branch? Need any help?

dimitrisnl avatar Feb 27 '21 11:02 dimitrisnl

@dcomtois Hey there do you plan on rebasing the branch? Need any help?

Hi, I haven't worked on this in quite a while, and I'm not sure how to go about this... So sure if you can help let's do it!

dcomtois avatar Feb 27 '21 21:02 dcomtois

@dimitrisnl I just added you as a collaborator -- sorry I didn't do it earlier, had tons of tabs open and after a crash, lost track of what I had done!

dcomtois avatar Mar 02 '21 05:03 dcomtois

hey @dcomtois That's for the link - I'll allocate some time and create a branch sometime this week!

dimitrisnl avatar Mar 02 '21 08:03 dimitrisnl