From: Steven Baltakatei Sandoval Date: Thu, 24 Sep 2020 09:48:01 +0000 (+0000) Subject: Merge branch 'develop' into feature/pid-1-sheet-2/BK-2020-04 X-Git-Tag: 2023-03-03~63 X-Git-Url: https://zdv2.bktei.com/gitweb/BK-2020-04.git/commitdiff_plain/d0139f12f76b4f2ef87a2c0eb102df4c94b4e9d3?ds=sidebyside;hp=--cc Merge branch 'develop' into feature/pid-1-sheet-2/BK-2020-04 Update and combine sheet 2 branch's REVISIONS.org file. Conflicts: REVISIONS.org --- d0139f12f76b4f2ef87a2c0eb102df4c94b4e9d3 diff --cc REVISIONS.org index e462264,01109d5..1331298 --- a/REVISIONS.org +++ b/REVISIONS.org @@@ -8,25 -8,24 +8,24 @@@ ** Revision History *** BK-2020-04-PID-1-SHT1 - | Identification code | Revision date | Rev | Creator | Approved | Comment | - |-----------------------+-------------------+-----+---------+----------+---------------------------| - | BK-2020-04-PID-1-SHT1 | 2020-09-23T14:23Z | A | SBS | | Initial draft | - | BK-2020-04-PID-1-SHT1 | 2020-09-23T14:46Z | B | SBS | | Remove alignment lines | - | BK-2020-04-PID-1-SHT1 | 2020-09-23T14:46Z | C | SBS | | Group symbols, add legend | - | BK-2020-04-PID-1-SHT1 | 2020-09-24T05:34Z | D | SBS | | Align symbols | + | Revision date | Rev | Creator | Approved | Comment | + |-------------------+-----+---------+----------+---------------------------| + | 2020-09-23T14:23Z | A | SBS | | Initial draft | + | 2020-09-23T14:46Z | B | SBS | | Remove alignment lines | + | 2020-09-23T14:46Z | C | SBS | | Group symbols, add legend | + | 2020-09-24T05:34Z | D | SBS | | Align symbols | *** BK-2020-04-PID-1-SHT2 - | Identification code | Revision date | Rev | Creator | Approved | Comment | - |-----------------------+-------------------+-----+---------+----------+------------------------------------| - | BK-2020-04-PID-1-SHT2 | 2020-09-24T03:33Z | A | SBS | | Initial draft | - | BK-2020-04-PID-1-SHT2 | 2020-09-24T05:14Z | B | SBS | | Align group titles, fix legend | - | BK-2020-04-PID-1-SHT2 | 2020-09-24T06:07Z | C | SBS | | Remove minor errant line | - | BK-2020-04-PID-1-SHT2 | 2020-09-24T06:17Z | D | SBS | | Fix minor text misalign | - | BK-2020-04-PID-1-SHT2 | 2020-09-24T09:23Z | E | SBS | | New layer: group partition objects | - | | | | | | | -| Revision date | Rev | Creator | Approved | Comment | -|-------------------+-----+---------+----------+--------------------------------| -| 2020-09-24T03:33Z | A | SBS | | Initial draft | -| 2020-09-24T05:14Z | B | SBS | | Align group titles, fix legend | -| 2020-09-24T06:07Z | C | SBS | | Remove minor errant line | -| 2020-09-24T06:17Z | D | SBS | | Fix minor text misalign | -| | | | | | ++| Revision date | Rev | Creator | Approved | Comment | ++|-------------------+-----+---------+----------+------------------------------------| ++| 2020-09-24T03:33Z | A | SBS | | Initial draft | ++| 2020-09-24T05:14Z | B | SBS | | Align group titles, fix legend | ++| 2020-09-24T06:07Z | C | SBS | | Remove minor errant line | ++| 2020-09-24T06:17Z | D | SBS | | Fix minor text misalign | ++| 2020-09-24T09:23Z | E | SBS | | New layer: group partition objects | *** BK-2020-04-PID-1-SHT3 - | Identification code | Revision date | Rev | Creator | Approved | Comment | - |---------------------+---------------+-----+---------+----------+---------| - | | | | | | | + | Revision date | Rev | Creator | Approved | Comment | + |---------------+-----+---------+----------+---------| + | | | | | |