Attempt to fix merge conflicts

INTO-CPS-Association · Jan 12, 2024 · 4d70329 · 4d70329
1 parent 7b3676a
commit 4d70329
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/lib-ms.yml b/.github/workflows/lib-ms.yml
@@ -57,6 +57,7 @@ jobs:
           files: servers/lib/coverage/clover.xml
           flags: lib-microservice-tests
 
+
   publish-package:
 
     if: | 

diff --git a/servers/lib/DEVELOPER.md b/servers/lib/DEVELOPER.md
@@ -10,7 +10,7 @@ file. Please see [README](./README.md) for this information.
 ```bash
 yarn install    # Install dependencies for the microservice
 yarn syntax     # Analyze code for errors and style issues
-yarn format     #format .ts[x] and .js[x] files with prettier.
+yarn format     #format .ts[x] and .js[x] files with prettier
 yarn graph      # Generate dependency graphs in the code
 yarn build      # Compile ES6 to ES5 and copy JS files to build/ directory
 yarn test:unit  # Run all tests
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,6 +57,7 @@ jobs: @@
               files: servers/lib/coverage/clover.xml
               flags: lib-microservice-tests
       publish-package:
         if: |
@@ Expand Down @@