touch up merge issue

Author: Zakk

pages/_meta.json

@@ -4,9 +4,6 @@
 	"core-concepts": "Core Concepts",
 	"voting-strategy": "Voting Strategy",
 	"payout-strategy": "Payout Strategy",
-<<<<<<< HEAD
-=======
 	"project-registry": "Project Registry",
->>>>>>> 157ff73 (initial setup for nextra docs site)
 	"extras": "Extras"
 }

pages/core-concepts/project-registry.mdx

@@ -66,10 +66,6 @@ Metadata can be updated using
 
 - `updateProjectMetadata(uint256 projectId,MetaPtr metadata)` - overwrites the existing metadata information for the project.
 
-<<<<<<< HEAD
-\
-=======
->>>>>>> da0c36c (implement next image)
 An event will be emitted when the metadata is successfully updated.\
 Only a project owner can update the metadata.
 

pages/index.mdx

@@ -1,14 +1,10 @@
-<<<<<<< HEAD
-=======
-<<<<<<<< HEAD:pages/index.mdx
->>>>>>> 654ac7c (theme and page cleanup after migrating from gitbook)
 ---
 description: What is the Allo Protocol?
 ---
 
 # Introduction
 
-Allo Protocol is a set of smart contracts that enable the democratic allocation and distribution of funds through the power of [Quadratic Funding](https://papers.ssrn.com/sol3/papers.cfm?abstract\_id=3243656). It is the former smart contract back-end for cGrants, Gitcoin's public goods funding product ([more background here](https://gov.gitcoin.co/t/introducing-gitcoin-grants-stack-allo-protocol-product-overviews-part-1-of-2/12664#the-story-of-allo-protocol-rebuilding-cgrants-from-the-ground-up-1)).
+Allo Protocol is a set of smart contracts that enable the democratic allocation and distribution of funds through the power of [Quadratic Funding](https://papers.ssrn.com/sol3/papers.cfm?abstract_id=3243656). It is the former smart contract back-end for cGrants, Gitcoin's public goods funding product ([more background here](https://gov.gitcoin.co/t/introducing-gitcoin-grants-stack-allo-protocol-product-overviews-part-1-of-2/12664#the-story-of-allo-protocol-rebuilding-cgrants-from-the-ground-up-1)).
 
 This new iteration is more flexible and more modular. It powers Gitcoin's three products, [Builder](https://github.com/gitcoinco/grants-round/tree/main/packages/builder), [Explorer](https://github.com/gitcoinco/grants-round/tree/main/packages/grant-explorer), and [Manager](https://github.com/gitcoinco/grants-round/tree/main/packages/round-manager). More importantly, it empowers anyone to build on top of a thriving ecosystem of grants and lets communities everywhere fund their shared needs.
 
@@ -18,11 +14,7 @@ You can learn more about the background of Allo in [Gitcoin's announcement post]
 
 In addition to Allo Protocol, Gitcoin offers a suite of products called the [Grants Stack](https://www.gitcoin.co/grants-stack).
 
-<<<<<<< HEAD
-Allo Protocol is for people building applications with novel capital allocation mechanisms, like quadratic funding. The protocol contains a registry of grant recipients ([Project Registry](core-concepts/project-registry.md)) as well as ways to define custom decision making processes for capital allocation ([Voting Strategy](core-concepts/voting-strategy/)) and ways to pay out those decisions ([Payout Strategy](core-concepts/payout-strategy/)). Anyone building custom tools for communities to allocate capital or for projects to receive capital should use Allo.
-=======
 Allo Protocol is for people building applications with novel capital allocation mechanisms, like quadratic funding. The protocol contains a registry of grant recipients ([Project Registry](core-concepts/project-registry/)) as well as ways to define custom decision making processes for capital allocation ([Voting Strategy](core-concepts/voting-strategy/)) and ways to pay out those decisions ([Payout Strategy](core-concepts/payout-strategy/)). Anyone building custom tools for communities to allocate capital or for projects to receive capital should use Allo.
->>>>>>> 654ac7c (theme and page cleanup after migrating from gitbook)
 
 The [Grants Stack](https://www.gitcoin.co/grants-stack) is a self-service suite of products for hosting a grants program. For now, it lets you run Gitcoin-style quadratic funding rounds in your ecosystem, but will expand into other forms of grants over time. The product suite offers everything you'd need to run your grants program without writing any code. So if you just want to run your grants program, the [Grants Stack](https://www.gitcoin.co/grants-stack) is a good fit for you.
 
@@ -39,29 +31,12 @@ If you are interested in building with Allo, check out the [Allo Builders Telegr
 We also welcome contributions and would love for you to [get involved](extras/getting-involved.md). \
 Finally, you can head to [gitcoin.co](https://www.gitcoin.co) to keep up to date with protocol releases.
 
-
-
 ### Next Steps
 
-import { Card, Cards } from "nextra-theme-docs";
+import { Card, Cards } from 'nextra-theme-docs'
 
 <Cards>
-  <Card
-    title="Conceptual Overview"
-    href="/core-concepts/conceptual-overview"
-  />
-  <Card
-    title="Contracts"
-    href="/getting-started/contracts"
-  />
-  <Card
-    title="Getting Involved"
-    href="/extras/getting-involved"
-  />
+  <Card title="Conceptual Overview" href="/core-concepts/conceptual-overview" />
+  <Card title="Contracts" href="/getting-started/contracts" />
+  <Card title="Getting Involved" href="/extras/getting-involved" />
 </Cards>
-<<<<<<< HEAD
-=======
-========
-# Allo Protocol Documentation
->>>>>>>> 654ac7c (theme and page cleanup after migrating from gitbook):pages/index.md
->>>>>>> 654ac7c (theme and page cleanup after migrating from gitbook)

theme.config.jsx

@@ -3,13 +3,5 @@ export default {
   project: {
     link: 'https://github.com/allo-protocol'
   },
-<<<<<<< HEAD
-<<<<<<< HEAD
   docsRepositoryBase: 'https://github.com/allo-protocol/docs/blob/main',
-=======
-  docsRepositoryBase: 'https://github.com/allo-protocol/docs',
->>>>>>> 157ff73 (initial setup for nextra docs site)
-=======
-  docsRepositoryBase: 'https://github.com/allo-protocol/docs/blob/main',
->>>>>>> 654ac7c (theme and page cleanup after migrating from gitbook)
 }