Pinned Loading

1. slowrouteux slowrouteux Public

   Forked from MRT-Map/slowroute

   Redesign of slowroute, a navigation service for the MRT powered by TypeScript.

   TypeScript 1

2. How to resolve merge conflicts How to resolve merge conflicts

   1

   # how to resolve merge conflicts

   2

   3

   so you have like a repo that needs to be synced with upstream, but you cant just sync fork. 

   4

   this is how to resolve it in vs code, which i like to use.

   5