Merge leftovers.

o1-labs · May 16, 2024 · 701f55f · 701f55f
1 parent f4a9948
commit 701f55f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/docs/zkapps/tutorials/02-private-inputs-hash-functions.mdx b/docs/zkapps/tutorials/02-private-inputs-hash-functions.mdx
@@ -38,7 +38,7 @@ In this tutorial, you build a smart contract with a piece of private state that
 
 ## Prerequisites
 
-This tutorial has been tested with [zkApp CLI](https://github.com/o1-labs/zkapp-cli) version `0.20.1`.
+This tutorial has been tested with [zkApp CLI](https://www.npmjs.com/package/zkapp-cli) version `0.20.1`.
 
 Ensure your environment meets the [Prerequisites](/zkapps/tutorials#prerequisites) for zkApp Developer Tutorials.
 

diff --git a/docs/zkapps/writing-a-zkapp/introduction-to-zkapps/testing-zkapps-lightnet.mdx b/docs/zkapps/writing-a-zkapp/introduction-to-zkapps/testing-zkapps-lightnet.mdx
@@ -67,26 +67,16 @@ When you use Lightnet via the [`zkapp-cli`](/zkapps/install-zkapp-cli) applicati
 
 ## High-level workflow for Lightnet
 
-<<<<<<< HEAD:docs/zkapps/testing-zkapps-lightnet.mdx
-1. [Write tests for your smart contract](/zkapps/testing-zkapps-locally#writing-tests-for-your-smart-contract) and test locally on a simulated local blockchain
+1. [Write tests for your smart contract](zkapps/writing-a-zkapp/introduction-to-zkapps/testing-zkapps-locally#writing-tests-for-your-smart-contract) and test locally on a simulated local blockchain
 1. Start the `Docker Engine`
 1. [Start the Lightnet](#start-the-single-node-network)
-=======
-1. [Write tests for your smart contract](zkapps/writing-a-zkapp/introduction-to-zkapps/testing-zkapps-locally#writing-tests-for-your-smart-contract) and test locally on a simulated local blockchain
-1. Start Docker Engine
-1. [Start Lightnet](#start-a-local-network)
->>>>>>> origin/main:docs/zkapps/writing-a-zkapp/introduction-to-zkapps/testing-zkapps-lightnet.mdx
 1. [Configure and deploy your zkApp to Lightnet](#configure-your-zkapp)
 1. Explore the Docker container processes [log files](#log-files)
 1. Use [lightweight Mina explorer](#lightweight-mina-explorer) to visualize the network state
 1. Develop, iterate, celebrate, [monitor and troubleshoot](#monitor-and-troubleshoot-the-network-state)
 1. [Stop the Lightnet](#stop-the-network)
 
-<<<<<<< HEAD:docs/zkapps/testing-zkapps-lightnet.mdx
-The best way to experience Lightnet is by using it via the [`zkapp-cli`](/zkapps/install-zkapp-cli).
-=======
-The best way to experience Lightnet is by using it from the [zkApp CLI](/zkapps/writing-a-zkapp/introduction-to-zkapps/install-zkapp-cli).
->>>>>>> origin/main:docs/zkapps/writing-a-zkapp/introduction-to-zkapps/testing-zkapps-lightnet.mdx
+The best way to experience Lightnet is by using it via the [`zkapp CLI`](/zkapps/writing-a-zkapp/introduction-to-zkapps/install-zkapp-cli).
 
 ## Start the Lightnet