fix merge conflicts

.editorconfig

@@ -1,12 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-indent_size = 4
-end_of_line = lf
-indent_style = space
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.{json,yml,yaml,md}]
-indent_size = 2

.prettierrc

@@ -1,5 +1,15 @@
 {
     "semi": false,
     "singleQuote": true,
-  "trailingComma": "none"
+    "trailingComma": "none",
+    "tabWidth": 4,
+    "endOfLine": "lf",
+    "overrides": [
+        {
+            "files": ["*.{json,yml,yaml,md}"],
+            "options": {
+                "tabWidth": 2
+            }
+        }
+    ]
 }

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v2.0.1](https://github.com/oceanprotocol/commons/compare/v2.0.0...v2.0.1)
+
+> 7 January 2020
+
+- more additionalInformation checks [`#213`](https://github.com/oceanprotocol/commons/pull/213)
+- remove editorconfig [`#211`](https://github.com/oceanprotocol/commons/pull/211)
+- remove editorconfig, define all styling in prettierrc [`f8dfaa4`](https://github.com/oceanprotocol/commons/commit/f8dfaa438c42e9d6c25ae9ac096129da95e431c3)
+
 #### [v2.0.0](https://github.com/oceanprotocol/commons/compare/v2.0.0-beta.3...v2.0.0)
 
 > 9 December 2019
@@ -11,7 +19,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Migrate to new v2 DDO structure [`#207`](https://github.com/oceanprotocol/commons/pull/207)
 - bump dependencies [`a8c695e`](https://github.com/oceanprotocol/commons/commit/a8c695e16f07b603250aa0eae5aa64d6275072b6)
 - test and package fixes [`3df046b`](https://github.com/oceanprotocol/commons/commit/3df046bbea14c0d0b4817976b8496c5af365bc0d)
-- bump to squid-js v1.0.0 [`7f9daa0`](https://github.com/oceanprotocol/commons/commit/7f9daa0d8277502dae4594c9d6779eebec8a3a90)
+- Release 2.0.0 [`70a3339`](https://github.com/oceanprotocol/commons/commit/70a3339f8b0fdbabad1475659639f145ec68ed6c)
 
 #### [v2.0.0-beta.3](https://github.com/oceanprotocol/commons/compare/v1.3.2...v2.0.0-beta.3)
 

client/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "commons-client",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "commons-client",
   "description": "Ocean Protocol marketplace frontend to explore, download, and publish open data sets.",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "license": "Apache-2.0",
   "scripts": {
     "start": "react-scripts start",

client/src/components/molecules/AssetTeaser.tsx

@@ -39,15 +39,17 @@ const AssetTeaser = ({
             }
         >
             <Link to={`/asset/${asset.id}`}>
-                {additionalInformation.categories && !minimal && (
+                {additionalInformation &&
+                    additionalInformation.categories &&
+                    !minimal && (
                         <CategoryImage
                             dimmed
                             category={additionalInformation.categories[0]}
                         />
                     )}
                 <h1>{main.name}</h1>
-                <h2>test</h2>
+
-                {!minimal && (
+                {additionalInformation && !minimal && (
                     <div className={styles.description}>
                         <Dotdotdot clamp={3}>
                             {additionalInformation.description}
@@ -55,7 +57,8 @@ const AssetTeaser = ({
                     </div>
                 )}
                 <footer className={styles.assetFooter}>
-                    {additionalInformation.categories && (
+                    {additionalInformation &&
+                        additionalInformation.categories && (
                             <div>{additionalInformation.categories[0]}</div>
                         )}
                     {allowPricing && (

docker-compose.yml

@@ -1,7 +1,6 @@
 version: '3.4'
 
 services:
-
   client:
     build:
       context: ./client
@@ -21,4 +20,3 @@ services:
       dockerfile: ./Dockerfile
     ports:
       - 4000:4000
-

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "commons",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "commons",
   "description": "Ocean Protocol marketplace to explore, download, and publish open data sets.",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "license": "Apache-2.0",
   "scripts": {
     "install": "./scripts/install.sh",

server/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "commons-server",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "commons-server",
   "description": "Ocean Protocol marketplace backend.",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "license": "Apache-2.0",
   "main": "dist/src/server.js",
   "scripts": {