fix conflict

Author: yann-yinn

components/PageIndex.vue

@@ -57,10 +57,6 @@ export default {
     HomeWidgets,
   },
   props: {
-<<<<<<< HEAD
-    latestRecipes: { type: Array, default: [] },
-    latestPromoted: { type: Array, default: [] },
-=======
     latestRecipes: {
       type: Array,
       required: true,
@@ -69,7 +65,6 @@ export default {
       type: Array,
       required: true,
     },
->>>>>>> dev
   },
 };
 </script>