From 7a495032ae01c65f7ff939733f8a324fbeadaa13 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 2 May 2012 16:07:29 +0200 Subject: [PATCH] rr --- telemeta/models/__init__.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/telemeta/models/__init__.py b/telemeta/models/__init__.py index f0abd449..e4e118c5 100644 --- a/telemeta/models/__init__.py +++ b/telemeta/models/__init__.py @@ -34,6 +34,7 @@ # Author: Olivier Guilyardi # Guillaume Pellerin +from media import * from location import * from instrument import * from enum import * @@ -41,9 +42,5 @@ from system import * from query import * from dublincore import * from language import * -<<<<<<< HEAD -from media import * -======= from format import * ->>>>>>> 20ef7d80a27aceda8f8266b7404d0b37a7ecf7ca -- 2.39.5