diff options
| author | Pedram Ashofteh Ardakani <pedramardakani@pm.me> | 2020-05-16 12:51:38 +0430 |
|---|---|---|
| committer | Pedram Ashofteh Ardakani <pedramardakani@pm.me> | 2020-05-16 12:51:38 +0430 |
| commit | f35810e4e482d6aea65c1977702512b07b5059e0 (patch) | |
| tree | 0ac09a47b00938d96141ef9088405aaf712cc925 /prog | |
| parent | 53e30a3169f5dc02b5e4b57c150249db54a6a728 (diff) | |
| parent | 29b6ca886477c3248e399b9114326ce89ee424e5 (diff) | |
Merge upstream 'dev' into local dev
Problem with local repo. Using `git reset <commit hash>` changes the
HEAD location. And it looks like I have pushed this before. So, there
were some complications. Now, fix it.
Diffstat (limited to 'prog')
0 files changed, 0 insertions, 0 deletions