From 51905c07af933f7a6b4bdd4655b5b923ec3c0bac Mon Sep 17 00:00:00 2001
From: Adubbz <Adubbz@users.noreply.github.com>
Date: Fri, 24 Dec 2021 19:42:41 +1100
Subject: [PATCH] =?UTF-8?q?=EF=BB=BFRainbow=20hills=20WIP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/biomesoplenty/api/biome/BOPBiomes.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/biomesoplenty/api/biome/BOPBiomes.java b/src/main/java/biomesoplenty/api/biome/BOPBiomes.java
index 4381b567d..9e115fce3 100644
--- a/src/main/java/biomesoplenty/api/biome/BOPBiomes.java
+++ b/src/main/java/biomesoplenty/api/biome/BOPBiomes.java
@@ -50,7 +50,11 @@ public class BOPBiomes
     public static final ResourceKey<Biome> ORIGIN_VALLEY = register("origin_valley");
     public static final ResourceKey<Biome> PASTURE = register("pasture");
     public static final ResourceKey<Biome> PRAIRIE = register("prairie");
+<<<<<<< HEAD
     public static final ResourceKey<Biome> PUMPKIN_PATCH = register("pumpkin_patch");
+=======
+    public static final ResourceKey<Biome> RAINBOW_HILLS = register("rainbow_hills");
+>>>>>>> e73df6ba (Rainbow hills WIP)
     public static final ResourceKey<Biome> RAINFOREST = register("rainforest");
     public static final ResourceKey<Biome> RAINFOREST_CLIFFS = register("rainforest_cliffs");
     public static final ResourceKey<Biome> REDWOOD_FOREST = register("redwood_forest");