CVS update

1 files changed, 0 insertions, 18 deletions

diff --git a/exif.module b/exif.module
index 2f41afb..3853eb4 100755
--- a/exif.module
+++ b/exif.module
@@ -44,21 +44,7 @@ function exif_nodeapi(&$node, $op, $teaser) {
             $fid, $ifd, $tag, $value);
         }
       }
-<<<<<<< exif.module
-    case 'insert':
-      if (! _exif_check_for_exif_data($node->type)) {
-        return;
-      }
-
-      $info = content_types($node->type);
-      $fields = $info['fields'];
-      $exif = _exif_get_class();
-
-      //get all the fields that will be filled with exif data
-      $ar_exif_fields = $exif->getExifFields($fields);
-=======
       break;
->>>>>>> 1.9
 
     case 'load':
       $fid = db_result(db_query("SELECT fid FROM {files} WHERE filepath = '%s'", $node->images[IMAGE_ORIGINAL]));
@@ -347,9 +333,6 @@ function theme_exif_table($node) {
       $rows[] = $row;
     }
   }
-<<<<<<< exif.module
-}
-=======
 
   if (empty($rows)) {
     return '';
@@ -377,4 +360,3 @@ function _exif_bootstrap() {
   include_once drupal_get_path('module', 'exif') .'/pel/PelJpeg.php';
 }
 
->>>>>>> 1.9