Cleaning up after merge.

2026-07-12 01:57:58 +08:00 · 2016-12-06 18:20:19 -05:00
parent 507e89a301
commit 74eb09a807
1 changed files with 0 additions and 1 deletions
@@ -5,7 +5,6 @@ import {PopupMenu, Button} from 'coral-ui';

 const name = 'coral-plugin-flags';

-<<<<<<< HEAD
 export default class FlagButton extends Component {

  state = {