From 9186c6413e7cdfc33527ca69d2e56dfec6d8b760 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 16 Jun 2014 18:59:24 -0400 Subject: [PATCH] Merge non-fast-forward for release branch merges --- src/main/java/com/gitblit/wicket/pages/ReflogPage.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/ReflogPage.java b/src/main/java/com/gitblit/wicket/pages/ReflogPage.java index c97b2cc..29fd449 100644 --- a/src/main/java/com/gitblit/wicket/pages/ReflogPage.java +++ b/src/main/java/com/gitblit/wicket/pages/ReflogPage.java @@ -19,8 +19,8 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink; import com.gitblit.wicket.CacheControl; -import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.CacheControl.LastModified; +import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.ReflogPanel; @CacheControl(LastModified.REPOSITORY) -- Gitblit v1.9.1