Minor issue

Author: giardiv

src/theme/theme.ts

@@ -32,11 +32,8 @@ import checkbox from './checkbox';
 import select from './select';
 // Bar
 import bar from './bar';
-<<<<<<< HEAD
 // Code
 import code from './code';
-=======
->>>>>>> master
 // Types
 import { ITheme } from './types';
 
@@ -107,10 +104,7 @@ const theme: ITheme = {
     badges,
     popup,
     bar,
-<<<<<<< HEAD
     code,
-=======
->>>>>>> master
     select,
   },
   text: {