diff options
| author |   Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com> | 2017-10-12 08:53:57 +0530 |
|---|---|---|
| committer | Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com> | 2017-11-20 14:03:07 +0530 |
| commit | 14880ec3b183f52ea3f3fea460adf807c8643b70 (patch) | |
| tree | b31ea050a710686ed6113eca7431b36dbe5ef349 /main | |
| parent | a96cd9cbb9b23f4b7ad4e051a5dad7602ac967f0 (diff) | |
Fix rebased conflicts from master
Issue-Id: CLI-66
Change-Id: I1cc275c2794d9c7e4b951f648eb8cc1e569973c5
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/main/resources/oclip-readme.txt (renamed from main/src/main/resources/onap-readme.txt) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/main/src/main/resources/onap-readme.txt b/main/src/main/resources/oclip-readme.txt index a2048606..a2048606 100644 --- a/main/src/main/resources/onap-readme.txt +++ b/main/src/main/resources/oclip-readme.txt |