From a087c9e3dbd5028be6ab81c11e852f853095b178 Mon Sep 17 00:00:00 2001
From: Leigh B Stoller <stoller@flux.utah.edu>
Date: Wed, 16 May 2012 17:42:56 -0600
Subject: [PATCH] Fix conflict

---
 sql/updates/4/{291 => 292} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename sql/updates/4/{291 => 292} (100%)

diff --git a/sql/updates/4/291 b/sql/updates/4/292
similarity index 100%
rename from sql/updates/4/291
rename to sql/updates/4/292
-- 
GitLab