Removing conflict code

Author: dcooney

pages/index.js

@@ -54,16 +54,8 @@ export default function HomePage({post}) {
 /**
  * Get post static props.
  *
-<<<<<<< HEAD
- * @see https://github.com/WebDevStudios/nextjs-starter-wordpress/blob/main/themes/wds_headless/inc/menus.php
- * @param {object}  context             Context for current post.
- * @param {boolean} context.preview     Whether requesting preview of post.
- * @param {object}  context.previewData Post preview data.
- * @return {object}                      Post props.
-=======
  * @author WebDevStudios
  * @return {object} Post props.
->>>>>>> b94848f4dba6c575636b21821be52f6717dd39e0
  */
 export async function getStaticProps() {
   return await getPostTypeStaticProps({slug: '/'}, postType)