From 74eb09a80759ab54b2cdf4b7e0144066f6a57e37 Mon Sep 17 00:00:00 2001 From: David Jay Date: Tue, 6 Dec 2016 18:20:19 -0500 Subject: [PATCH] Cleaning up after merge. --- client/coral-plugin-flags/FlagButton.js | 1 - 1 file changed, 1 deletion(-) diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js index 41e9cccf3..baee12295 100644 --- a/client/coral-plugin-flags/FlagButton.js +++ b/client/coral-plugin-flags/FlagButton.js @@ -5,7 +5,6 @@ import {PopupMenu, Button} from 'coral-ui'; const name = 'coral-plugin-flags'; -<<<<<<< HEAD export default class FlagButton extends Component { state = {