F2P-47: rebase with master to resolve conflicts.

digicatapult · Mar 30, 2022 · a0c64a6 · a0c64a6
2 parents eb7962f + 52bd844
commit a0c64a6
Show file tree

Hide file tree

Showing 5 changed files with 118 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,9 @@
 
 ## Description
 
-Front-end for a license Issuer in Veritable. Issuers can issue credentials that later can be approved by the CAA authorities. 
+Front-end for a license Issuer ( FlyDesire ) in Veritable. Issuers can issue credentials that later can be approved by the Regulator.
+
+---
 
 ## Getting started
 
@@ -68,3 +70,4 @@ All the React components / sub-components, in this project are developed using t
 
 That means that every existing React component here has its own folder with an _index.js_ file and the component itself. This makes importing components more elegant. In addition, certain components are grouped inside folders and sub-folders.
 
+---
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "veritable-issuer",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Front-end for Veritable credentials issuer",
   "author": "Digital Catapult (https://www.digicatapult.org.uk/)",
   "license": "Apache-2.0",

diff --git a/src/components/Common/Navigation/LogoWrap/LogoWrap.js b/src/components/Common/Navigation/LogoWrap/LogoWrap.js
@@ -11,7 +11,7 @@ export default function LogoWrap({ children }) {
       <span>
         &nbsp;
         <b className="small">
-          Drone Training <span className="small">Ltd.</span>
+          <span className="small">&nbsp;</span>
         </b>
       </span>
       {children && children}