From c2677c9c23dd7c2c010ed803c50767b57a7291bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caridy=20Pati=C3=B1o?= <caridy@gmail.com>
Date: Wed, 26 Sep 2018 18:12:00 -0400
Subject: [PATCH] * refactor(engine): removal of is attr and forceTagName *
 refactor(engine): removal of is attr and forceTagName * fix(engine): removing
 integration test for forceTagName * fix: remove custom element transformation
 from CSS (#695) * fix(compiler): fixing fixtures * refactor(engine): snabbdom
 lite - phase 1 (#606) * refactor(engine): removal of is attr and forceTagName
 * refactor(engine): removal of is attr and forceTagName * fix(engine):
 removing integration test for forceTagName * refactor(engine): snabbdom lite
 - phase 1 * refactor(engine): adding hooks.ts * refactor(engine): removing
 global hooks * refactor(engine): splitting style and class modules into
 static and dynamic * test(engine): ready for the final push *
 refactor(engine): making hooks mandatory. * refactor(engine): making all
 hooks functions * refactor(engine): dynamic diff vs static diff *
 refactor(engine): using two diff algos * refactor(engine): removing htmlapi
 in favor of pure patching * fix(engine): missing argument when determining
 diff algo * fix(engine): adding tests for dynamic diff * fix(engine): clean
 up * fix(engine): integration test failures * refactor(engine): proto
 chaining * fix(engine): wrong auto import * fix(engine): correcting the proto
 chain * refactor(engine): implementing the base element proto chain *
 test(engine): adding more tests for restrictions on elements *
 refactor(engine): rename to BaseBridgeElement * feat(engine): dom patching
 (#688) * feat(engine): dom patching * fix(engine): cleanup descriptors *
 feat(engine): rebase * fix(engine): linting * fix(engine): pr feedback *
 fix(engine): lint * fix(compiler): updated snapshot testing to account for
 shadow dom * fix(engine): pr feedback * fix(engine): fixing restrictions on
 custom elements * fix(engine): exposing host (#705) * fix(engine): exposing
 host * fix(engine): shadow root * wip(engine): linting and type errors *
 fix(engine): cleaning up shadow root detection * fix(engine): removing
 restrictions test * fix(engine): fixing element from point methods *
 fix(engine): disabling some attribute integration test for now * fix(engine):
 linting * fix(engine): upgrade ie11 driver * fix(engine): compat test fix *
 fix(engine): applying elementFromPoint on document * fix(engine): linting *
 fix(engine): reverting unnecessary changes * fix(engine): removing skip in
 test * fix(engine): polyfill readmes * fix(engine): review feedback *
 fix(engine): integration tests for elementFromPoint * fix(engine): ie11
 elementsFromPoint * fix(engine): feedback * fix(engine): ts fix * wip: yarn
 update * fix(engine): fixing snapshot test

wip: styles still broken

wip: fix styles
---
 packages/lwc-engine/src/faux-shadow/shadow-root.ts | 4 ----
 packages/lwc-engine/src/framework/api.ts           | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/packages/lwc-engine/src/faux-shadow/shadow-root.ts b/packages/lwc-engine/src/faux-shadow/shadow-root.ts
index 60fa10e5e9..0d3c594994 100644
--- a/packages/lwc-engine/src/faux-shadow/shadow-root.ts
+++ b/packages/lwc-engine/src/faux-shadow/shadow-root.ts
@@ -1,11 +1,7 @@
 import assert from "../shared/assert";
 import { isFalse, create, isUndefined, getOwnPropertyDescriptor, ArrayReduce, isNull, defineProperties, setPrototypeOf } from "../shared/language";
 import { addShadowRootEventListener, removeShadowRootEventListener } from "./events";
-<<<<<<< HEAD
-import { shadowDomElementFromPoint, shadowRootQuerySelector, shadowRootQuerySelectorAll, shadowRootChildNodes, isNodeOwnedBy, isSlotElement } from "./traverse";
-=======
 import { shadowDomElementFromPoint, shadowRootQuerySelector, shadowRootQuerySelectorAll, shadowRootChildNodes, isNodeOwnedBy } from "./traverse";
->>>>>>> * refactor(engine): removal of is attr and forceTagName
 import { getInternalField, setInternalField, createFieldName } from "../shared/fields";
 import { getInnerHTML } from "../3rdparty/polymer/inner-html";
 import { getTextContent } from "../3rdparty/polymer/text-content";
diff --git a/packages/lwc-engine/src/framework/api.ts b/packages/lwc-engine/src/framework/api.ts
index c55a072bbd..4478bf36d4 100644
--- a/packages/lwc-engine/src/framework/api.ts
+++ b/packages/lwc-engine/src/framework/api.ts
@@ -1,10 +1,6 @@
 import assert from "../shared/assert";
 import { vmBeingRendered, invokeEventListener } from "./invoker";
-<<<<<<< HEAD
 import { isArray, isUndefined, isNull, isFunction, isObject, isString, ArrayPush, create as ObjectCreate, forEach, StringCharCodeAt, isNumber, isTrue, isFalse, toString } from "../shared/language";
-=======
-import { isArray, isUndefined, isNull, isFunction, isObject, isString, ArrayPush, create as ObjectCreate, forEach, StringCharCodeAt, isNumber, isTrue } from "../shared/language";
->>>>>>> * refactor(engine): removal of is attr and forceTagName
 import { EmptyArray, resolveCircularModuleDependency, isCircularModuleDependency, EmptyObject } from "./utils";
 import { VM, SlotSet } from "./vm";
 import { ComponentConstructor } from "./component";