Skip to content

Commit

Permalink
Fix merge error.
Browse files Browse the repository at this point in the history
  • Loading branch information
jasmussen committed May 9, 2017
1 parent e9ea947 commit c851bdf
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions editor/layout/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import classnames from 'classnames';
/**
* Internal dependencies
*/
import Header from 'header';
import Sidebar from 'sidebar';
import TextEditor from 'modes/text-editor';
import VisualEditor from 'modes/visual-editor';
import Header from '../header';
import Sidebar from '../sidebar';
import TextEditor from '../modes/text-editor';
import VisualEditor from '../modes/visual-editor';

function Layout( { mode, isSidebarOpened } ) {
const className = classnames( 'editor-layout', {
Expand Down

0 comments on commit c851bdf

Please sign in to comment.