diff options
| author | Glenn Vriesman <g.vriesman@livetech-systems.com> | 2018-08-18 12:53:26 +0200 |
|---|---|---|
| committer | Glenn Vriesman <g.vriesman@livetech-systems.com> | 2018-08-18 12:53:26 +0200 |
| commit | 7b85d146afbe7d93627fcbd657625b6bb84035d7 (patch) | |
| tree | 06adf3c52cdbc825f04fd50ee239edab02331717 /docs | |
| parent | fd01cdb13779f71108e04402e197ec10db398c12 (diff) | |
Docs: Made resolving merge conflicts a local file
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/resources/resolving-merge-conflicts.gif | bin | 0 -> 2249254 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/docs/resources/resolving-merge-conflicts.gif b/docs/resources/resolving-merge-conflicts.gif Binary files differnew file mode 100644 index 000000000..0b943fd49 --- /dev/null +++ b/docs/resources/resolving-merge-conflicts.gif |
