diff options
| author |   Brady Johnson <brady.allen.johnson@ericsson.com> | 2016-09-02 12:58:30 +0200 |
|---|---|---|
| committer | Brady Johnson <brady.allen.johnson@ericsson.com> | 2016-09-02 11:37:45 +0000 |
| commit | 7891147ba12fa9595d10aa76c617999392dbe5dd (patch) | |
| tree | b386c39cb4b040ede5e598fd2e4f237496b41db2 /docs/design/architecture.rst | |
| parent | a0e2c1d0cbba861aac0b44bd61beb41ddca70630 (diff) | |
Fixing problems with merge from previous commit
- Some <<< HEAD tags were left over from a previous merge that
wasnt completely resolved.
Change-Id: I2dbafdde44a4099f172aecc94ec8dc1435855570
Signed-off-by: Brady Johnson <brady.allen.johnson@ericsson.com>
(cherry picked from commit b1524c428841607007d608dcf925480c68f285ac)
Diffstat (limited to 'docs/design/architecture.rst')
0 files changed, 0 insertions, 0 deletions