From 2d729f61bed22917632b73e35717bd14f4ed3bcd Mon Sep 17 00:00:00 2001
From: Her Email <nobody@example.org>
Date: Sun, 17 Dec 2023 22:21:29 -0500
Subject: [PATCH] fix NEODB-SOCIAL-1X1

---
 journal/models/mark.py | 5 ++++-
 neodb-takahe           | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/journal/models/mark.py b/journal/models/mark.py
index ed5fd861..6c9fa1bd 100644
--- a/journal/models/mark.py
+++ b/journal/models/mark.py
@@ -203,7 +203,10 @@ class Mark:
             if created_time and created_time != self.shelfmember.created_time:
                 self.shelfmember.created_time = created_time
                 log_entry.timestamp = created_time
-                log_entry.save(update_fields=["timestamp"])
+                try:
+                    log_entry.save(update_fields=["timestamp"])
+                except:
+                    log_entry.delete()
                 shelfmember_changed = True
             if shelfmember_changed:
                 self.shelfmember.save()
diff --git a/neodb-takahe b/neodb-takahe
index fecf134a..e6ca7e99 160000
--- a/neodb-takahe
+++ b/neodb-takahe
@@ -1 +1 @@
-Subproject commit fecf134a68bc01766220b24c5b7072bb4aae91f7
+Subproject commit e6ca7e99828c54b580897a57f82179b24ed8b2e8