ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 01:25:17 +01:00
Code Issues Releases Wiki Activity

merge fix

Browse Source
This commit is contained in:
ddejongh 2015-06-01 16:03:41 +02:00
parent 3f9f133224
commit 420516a2fe
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/components/edition.js
View File

@ -1,7 +1,5 @@
import React from 'react'; import React from 'react';
<<<<<<< HEAD
import ResourceViewer from './ascribe_media/resource_viewer'; import ResourceViewer from './ascribe_media/resource_viewer';
=======
import ImageViewer from './ascribe_media/image_viewer'; import ImageViewer from './ascribe_media/image_viewer';
import LoanModalButton from './ascribe_modal/modal_loan'; import LoanModalButton from './ascribe_modal/modal_loan';
@ -10,7 +8,6 @@ import UnConsignModalButton from './ascribe_modal/modal_unconsign';
import UnConsignRequestModalButton from './ascribe_modal/modal_unconsign_request'; import UnConsignRequestModalButton from './ascribe_modal/modal_unconsign_request';
import TransferModalButton from './ascribe_modal/modal_transfer'; import TransferModalButton from './ascribe_modal/modal_transfer';
import ShareModalButton from './ascribe_modal/modal_share'; import ShareModalButton from './ascribe_modal/modal_share';
>>>>>>> master
/** /**
* This is the component that implements display-specific functionality * This is the component that implements display-specific functionality