From 11185161a0ec5c15a1852fd7bc387b82573b577a Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Fri, 14 Apr 2017 19:37:35 +0200
Subject: Django 1.8: fix import errors, deprecation warnings and models
 warnings

---
 ishtar_common/model_merging.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ishtar_common/model_merging.py')

diff --git a/ishtar_common/model_merging.py b/ishtar_common/model_merging.py
index c577a8cf1..b2ed68358 100644
--- a/ishtar_common/model_merging.py
+++ b/ishtar_common/model_merging.py
@@ -2,10 +2,10 @@
 
 from django.db import transaction
 from django.db.models import get_models, Model
-from django.contrib.contenttypes.generic import GenericForeignKey
+from django.contrib.contenttypes.fields import GenericForeignKey
 
 
-@transaction.commit_on_success
+@transaction.atomic
 def merge_model_objects(primary_object, alias_objects=[], keep_old=False):
     """
     Use this function to merge model objects (i.e. Users, Organizations, Polls,
-- 
cgit v1.2.3