Fixed Imperative in .csv file, resorted the verbs #8
Conversation
|
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. |
|
@dcomtois there's this one too but there is a conflict in place at the moment? |
|
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) |
Also added form_2s for verb ocurrir, imperativo (afirmativo + negativo)
Typos found by @dkirkby
|
@dcomtois It's saying there's a merge conflict. You may need to merge the main repo since the json addition |
|
@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! |
|
@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! |
|
hey @dcomtois That's for the link - I'll allocate some time and create a branch sometime this week! |
No description provided.