Added conflict resolution on sync and snippet parsing

ThePrimeagen / uhh

When you keep forgetting those sweet sweet sweet sweet commands.

26 stars 6 forks source link

Closed voldyman closed 4 years ago

voldyman commented 4 years ago

Added snippet parsing and conflict resolution during sync.

ThePrimeagen commented 4 years ago

I think overall this is great.

Could you resolve the conflicts and i merge.