From ae16ccd9189914c5c9cd0bca63bb497901249a52 Mon Sep 17 00:00:00 2001
From: Jesse McConnell <jesse.mcconnell@gmail.com>
Date: Mon, 24 Oct 2011 10:56:31 -0500
Subject: [PATCH 1/2] add merge tool bit to gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 11c793e1afe..e39c5e13af8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,6 @@ target/
 
 # vim
 .*.sw[a-p]
+
+# merge tooling
+*.orig

From 261bb4a71f08cc585de365b65513b5545da706e1 Mon Sep 17 00:00:00 2001
From: Jesse McConnell <jesse.mcconnell@gmail.com>
Date: Mon, 24 Oct 2011 13:55:02 -0500
Subject: [PATCH 2/2] update jetty version maven plugin version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 12d10ef83a3..f59e0a3784e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
         <plugin>
           <groupId>org.eclipse.jetty.toolchain</groupId>
           <artifactId>jetty-version-maven-plugin</artifactId>
-          <version>1.0.6</version>
+          <version>1.0.7</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>