fixing conflict

vinooganesh · Feb 27, 2024 · b89a30f · b89a30f
2 parents f728ba1 + 4657e85
commit b89a30f
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/content/en/docs/Learning Resources/Blog Posts/_index.md b/content/en/docs/Learning Resources/Blog Posts/_index.md
@@ -9,5 +9,8 @@ description: >
 * [Apache Parquet: Cost Efficiency @ Scale in Big Data File Format](https://eng.uber.com/cost-efficiency-big-data/)
 
 * [One Stone, Three Birds: Finer-Grained Encryption @ Apache Parquet](https://eng.uber.com/one-stone-three-birds-finer-grained-encryption-apache-parquet/)
+<<<<<<< HEAD
 
 * [Designing a Parquet Catalog for InfluxDB IOx](https://www.influxdata.com/blog/designing-a-parquet-catalog-for-influxdb-iox/)
+=======
+>>>>>>> refs/remotes/origin/staging