Remove merge conflict line from docs (#158)

tmarkovski · web-flow · commit 934d4fdc227a · 2021-10-28T10:17:48.000-07:00
diff --git a/docs/index.md b/docs/index.md
@@ -30,6 +30,4 @@ Hundreds of organizations of all sizes and industries use Trinsic’s infrastruc
 
 - [ ] React Native
 
->>>>>>> e05816a0d20c4093d638d7240988a0bf6cee6811
-
-Next: [Learn the Concepts](./concepts/index.md)
+Next: [Learn the Concepts](./concepts/index.md)
