Fix yml typo

Br1an-Boyle · Br1an-Boyle · commit eb6fd09bfb3c · 2022-02-11T13:00:16.000Z
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -21,8 +21,6 @@ executors:
 
 orbs:
   android: circleci/android@1.0
-<<<<<<< Updated upstream
-
 
 # Always run job
 run_always: &run_always
