chore(*): fixing some merge errors #3519

IgniteUI · Jan 22, 2019 · ae931d9 · ae931d9
1 parent 08173d9
commit ae931d9
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 12 deletions.
diff --git a/angularDocs.nuspec b/angularDocs.nuspec
@@ -11,7 +11,6 @@
  	</metadata>
  	<files>
  		<file src="dist\igniteui-angular\docs\**\*.*" target="\" />
-		<file src="extras\PreDeploy.ps1" target="" />
  		<!-- <file src="web.config" target="" /> -->
  	</files>
 </package>
diff --git a/extras/PreDeploy.ps1 b/extras/PreDeploy.ps1
diff --git a/src/styles/igniteui-theme.scss b/src/styles/igniteui-theme.scss
@@ -36,10 +36,4 @@
     .igniteui-logo__rocket {
         fill: rgba(white, .38);
     }
-
-    $my-tabs-theme: igx-tabs-theme(
-        $item-background: #000
-    );
-
-    @include igx-tabs($my-tabs-theme);
 }