projects
/
BK-2020-04.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6a52266
01bba4c
)
merge(PID-1-SHT2):REV B:Merge in sheet 2 changes
author
Steven Baltakatei Sandoval
<baltakatei@gmail.com>
Thu, 24 Sep 2020 05:54:01 +0000
(
05:54
+0000)
committer
Steven Baltakatei Sandoval
<baltakatei@gmail.com>
Thu, 24 Sep 2020 05:54:01 +0000
(
05:54
+0000)
Merge required instead of fast-forward since REVISIONS.org also
changed.
Merge branch 'feature/pid-1-sheet-2/BK-2020-04' into develop
Conflicts:
REVISIONS.org
Trivial merge