Merge branch 'master' into tma-722-cornell-fe

# Conflicts:
#	src/constants/constants.ts
#	src/services/ExploreService.ts
#	src/services/UserProfileService.ts
#	src/types/types.ts

1 files changed, 0 insertions, 18 deletions

diff --git a/src/components/search/SearchCategories.tsx b/src/components/search/SearchCategories.tsx
index 4bae27c2..c747b34f 100644
--- a/src/components/search/SearchCategories.tsx
+++ b/src/components/search/SearchCategories.tsx
@@ -73,23 +73,5 @@ const styles = StyleSheet.create({
     flexWrap: 'wrap',
     justifyContent: 'space-evenly',
   },
-  buttonContainer: {
-    backgroundColor: 'transparent',
-    width: 158,
-    height: 37,
-    borderRadius: 20,
-    borderColor: 'transparent',
-    borderWidth: 1,
-    flexDirection: 'row',
-    alignContent: 'center',
-    justifyContent: 'center',
-  },
-  buttonText: {
-    fontWeight: '400',
-    fontSize: 15,
-    lineHeight: 17.9,
-    alignSelf: 'center',
-    color: 'white',
-  },
 });
 export default SearchCategories;