diff options
| author | Borivoje Tasovac <btasovac@gitlab.com> | 2018-12-20 10:23:39 +0300 |
|---|---|---|
| committer | Borivoje Tasovac <btasovac@gitlab.com> | 2018-12-20 10:23:39 +0300 |
| commit | 6a1683134df12a62018621dda688e81562e621a1 (patch) | |
| tree | b39ffc29db88f1c3f14e915d11fa5082370cf39c | |
| parent | 62761600b0ae488115bd611babe891efc0b36a26 (diff) | |
Resolve conflict
| -rw-r--r-- | data/oss_projects.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/data/oss_projects.yml b/data/oss_projects.yml index b3c14dd..ab7bd7a 100644 --- a/data/oss_projects.yml +++ b/data/oss_projects.yml @@ -1109,14 +1109,12 @@ project_url: 'https://umod.org' gitlab_plan: Gold - -<<<<<<< HEAD:data/oss_projects.yml project_name: purify project_description: 'Vulnerability management tool for simplifying SecOps workflow' project_url: 'https://gitlab.com/purify-dev/purify' gitlab_plan: Gold -======= +- project_name: Crown Platform project_description: 'A decentralized blockchain platform for building and running new economy applications. It is completely decentralized, no company behind it. The project is managed using its own governance system, which is part of the software.' project_url: 'https://crown.tech' gitlab_plan: Ultimate ->>>>>>> artem-brazhnikov/gitlab-oss-master:data/projects.yaml |