resolving the conflicts

ODIM-Project · Sep 1, 2023 · 2bcd536 · 2bcd536
2 parents ef4523a + 8d2fcc7
commit 2bcd536
Show file tree

Hide file tree

Showing 3 changed files with 120 additions and 139 deletions.
diff --git a/.github/workflows/build_unittest.yml b/.github/workflows/build_unittest.yml
@@ -255,7 +255,7 @@ jobs:
           protos=("auth" "compositionservice")
           for str in ${protos[@]}; do
             proto_path="$(pwd)/lib-utilities/proto/$str"
-            proto_out_path="$(pwd)/svc-composition-service/app/proto/$str" 
+            proto_out_path="$(pwd)/svc-composition-service/app/proto/$str"
             proto_file_name="$str.proto"
             if [ $str == 'auth' ]
             then
@@ -273,7 +273,7 @@ jobs:
             if [[ -f "$proto_grpc_file" ]]; then
               sed -i 's/import '$protoc_pb2_name'/import proto.'$str'.'$protoc_pb2_name'/gI' $proto_grpc_file
             fi
-          done 
+          done
 
     - name: Build
       run: |
@@ -321,7 +321,7 @@ jobs:
             else
               GORACE=history_size=7 go test ./... --cover
             fi
-            
+
             echo "Test Done"
             if [ $? -eq 0 ]; then
               echo Unit Testing for odimra service/lib dependencies $i is Successful !!!!