summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorYaroslav Brustinov <ybrustin@cisco.com>2017-02-02 14:01:02 +0200
committerYaroslav Brustinov <ybrustin@cisco.com>2017-02-02 14:01:02 +0200
commit7c9861cd09fcbd4d0360acf9b64441c346c4ba12 (patch)
tree7951fd266b75e46d3400842af45075387c5cbc50 /doc
parentae142588405743298d322310434ba28b9b8b8f74 (diff)
remove code inserted by incorrect merge resolve
Change-Id: Ic2c4e8ce8cd5eed8bea230603838dd66f05ef4ea Signed-off-by: Yaroslav Brustinov <ybrustin@cisco.com>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions