From d6e60fde3ccd3d9ef00e6f57738f7f810df3c9b5 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandy@ionic.io>
Date: Thu, 2 Nov 2017 11:04:10 -0400
Subject: [PATCH] style(components): fix merge conflicts that didn't show up in
 search

---
 .../core/src/components/input/input-base.tsx  |  5 ---
 packages/core/src/components/menu/menu.tsx    |  8 +----
 .../core/src/components/toggle/toggle.tsx     | 34 ++++---------------
 3 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/packages/core/src/components/input/input-base.tsx b/packages/core/src/components/input/input-base.tsx
index d5d895ef51..0c8933f332 100644
--- a/packages/core/src/components/input/input-base.tsx
+++ b/packages/core/src/components/input/input-base.tsx
@@ -30,9 +30,6 @@ export interface InputBaseComponent {
   inputChanged: (ev: any) => void;
   inputFocused: (ev: any) => void;
   inputKeydown: (ev: any) => void;
-
-  disabledChanged: (ev: any) => void;
-  valueChanged: (ev: any) => void;
 }
 
 export interface InputComponent extends InputBaseComponent {
@@ -50,8 +47,6 @@ export interface InputComponent extends InputBaseComponent {
   step: string;
   size: number;
   type: string;
-
-  checkedChanged: (ev: any) => void;
 }
 
 export interface TextareaComponent extends InputBaseComponent {
diff --git a/packages/core/src/components/menu/menu.tsx b/packages/core/src/components/menu/menu.tsx
index b4e40256bd..fa97348621 100644
--- a/packages/core/src/components/menu/menu.tsx
+++ b/packages/core/src/components/menu/menu.tsx
@@ -81,14 +81,8 @@ export class Menu {
    */
   @Prop() side: Side = 'start';
   @PropDidChange('side')
-<<<<<<< HEAD
-  sideChanged() {
-    this.isRightSide = isRightSide(this.side);
-=======
   protected sideChanged() {
-    const isRTL = false;
-    this.isRightSide = isRightSide(this.side, isRTL);
->>>>>>> style(components): rename variables and methods for consistency
+    this.isRightSide = isRightSide(this.side);
   }
 
   /**
diff --git a/packages/core/src/components/toggle/toggle.tsx b/packages/core/src/components/toggle/toggle.tsx
index 6639702eba..7a0fdda2e3 100644
--- a/packages/core/src/components/toggle/toggle.tsx
+++ b/packages/core/src/components/toggle/toggle.tsx
@@ -24,9 +24,7 @@ export class Toggle implements BooleanInputComponent {
 
   hasFocus: boolean = false;
 
-<<<<<<< HEAD
   @State() activated: boolean = false;
-=======
   /**
    * @output {Event} Emitted when the value property has changed.
    */
@@ -41,7 +39,6 @@ export class Toggle implements BooleanInputComponent {
    * @output {Event} Emitted when the toggle has focus.
    */
   @Event() ionFocus: EventEmitter;
->>>>>>> style(components): rename variables and methods for consistency
 
   /**
    * @output {Event} Emitted when the toggle loses focus.
@@ -52,45 +49,28 @@ export class Toggle implements BooleanInputComponent {
    * @input {boolean} If true, the toggle is selected. Defaults to `false`.
    */
   @Prop({ mutable: true }) checked: boolean = false;
-<<<<<<< HEAD
-=======
 
-  /*
-   * @input {boolean} If true, the user cannot interact with the toggle. Default false.
-   */
-  @Prop({ mutable: true }) disabled: boolean = false;
-
-  /**
-   * @input {string} the value of the toggle.
-   */
-  @Prop({ mutable: true }) value: string;
-
-
-  protected ionViewWillLoad() {
-    this.emitStyle();
-  }
-
->>>>>>> style(components): rename variables and methods for consistency
   @PropDidChange('checked')
   protected checkedChanged(val: boolean) {
     this.ionChange.emit({ checked: val });
     this.emitStyle();
   }
 
+  /*
+   * @input {boolean} If true, the user cannot interact with the toggle. Default false.
+   */
   @Prop({ mutable: true }) disabled: boolean = false;
+
   @PropDidChange('disabled')
   protected disabledChanged() {
     this.emitStyle();
   }
 
-  // TODO: value is broken
+  /**
+   * @input {string} the value of the toggle.
+   */
   @Prop({ mutable: true }) value: string;
 
-  @Event() ionChange: EventEmitter;
-  @Event() ionStyle: EventEmitter;
-  @Event() ionFocus: EventEmitter;
-  @Event() ionBlur: EventEmitter;
-
   constructor() {
     this.gestureConfig = {
       'onStart': this.onDragStart.bind(this),