merge from master

onflow · Aug 9, 2023 · 9e19324 · 9e19324
2 parents f908054 + b723f1e
commit 9e19324
Show file tree

Hide file tree

Showing 35 changed files with 1,366 additions and 7,189 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,19 +16,12 @@ jobs:
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 14
-          cache: 'npm'
-          cache-dependency-path: lib/js/test/package-lock.json
       - name: Install Flow CLI
         run: sh -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/master/install.sh)" -- v1.3.1
       - name: Flow CLI Version
         run: flow version
       - name: Update PATH
         run: echo "/root/.local/bin" >> $GITHUB_PATH
-      - name: Install dependencies
-        run: cd lib/js/test && npm ci
       - name: Run tests
         run: make ci
 
diff --git a/Makefile b/Makefile
@@ -7,5 +7,4 @@ test:
 .PHONY: ci
 ci:
 	$(MAKE) ci -C lib/go
-	$(MAKE) ci -C lib/js/test
 	flow test --cover tests/*.cdc
diff --git a/contracts/FungibleTokenMetadataViews.cdc b/contracts/FungibleTokenMetadataViews.cdc
@@ -185,7 +185,11 @@ access(all) contract FungibleTokenMetadataViews {
     access(all) struct TotalSupply {
         access(all) let supply: UFix64
 
+<<<<<<< HEAD
         view init(totalSupply: UFix64) {
+=======
+        init(totalSupply: UFix64) {
+>>>>>>> origin/master
             self.supply = totalSupply
         }
     }