Skip to content

Commit 89cd0c0

Browse files
committed
fix merge
1 parent de35777 commit 89cd0c0

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

src/content/docs/workers/local-development.mdx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,9 @@ head: []
77
description: Develop your Workers locally via Wrangler.
88
---
99

10-
<<<<<<< HEAD:src/content/docs/workers/testing/local-development.mdx
11-
Cloudflare Workers and most connected resources can be fully developed and tested locally—providing confidence that the applications you build locally will work the same way in production. This allows you to be more efficient and effective by providing a faster feedback loop and removing the need to test against remote resources. Local development runs against the same production runtime used by Cloudflare Workers, [workerd](https://github.com/cloudflare/workerd).
12-
||||||| 1bcac4e218:src/content/docs/workers/testing/local-development.mdx
13-
Cloudflare Workers and most connected resources can be fully developed and tested locally - providing confidence that the applications you build locally will work the same way in production. This allows you to be more efficient and effective by providing a faster feedback loop and removing the need to test against remote resources. Local development runs against the same production runtime used by Cloudflare Workers, [workerd](https://github.com/cloudflare/workerd).
14-
=======
1510
Cloudflare Workers and most connected resources can be fully developed and tested locally - providing confidence that the applications you build locally will work the same way in production. This allows you to be more efficient and effective by providing a faster feedback loop and removing the need to [test against remote resources](#develop-using-remote-resources-and-bindings). Local development runs against the same production runtime used by Cloudflare Workers, [workerd](https://github.com/cloudflare/workerd).
16-
>>>>>>> origin/production:src/content/docs/workers/local-development.mdx
1711

18-
When developing Workers locally with [`wrangler dev`](/workers/wrangler/commands/#dev), you can access local emulators of resources such as [R2](/r2/), [KV](/kv/), [D1](/d1/), and [Durable Objects](/durable-objects/).
12+
In addition to testing Workers locally with [`wrangler dev`](/workers/wrangler/commands/#dev), the use of Miniflare allows you to test other Developer Platform products locally, such as [R2](/r2/), [KV](/kv/), [D1](/d1/), and [Durable Objects](/durable-objects/).
1913

2014
## Start a local development server
2115

0 commit comments

Comments
 (0)