From 90e7660cac64a949ac7d4e71302ac3509e8ce5a5 Mon Sep 17 00:00:00 2001
From: Dennis Kao <ulysseskao@gmail.com>
Date: Tue, 08 Apr 2014 15:32:49 +0800
Subject: [PATCH] Merge branch 'origin/2.1.x'

---
 xdgnjobs/ximple-jobcarrier/.gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/xdgnjobs/ximple-jobcarrier/.gitignore b/xdgnjobs/ximple-jobcarrier/.gitignore
index b83d222..1ae0a1b 100644
--- a/xdgnjobs/ximple-jobcarrier/.gitignore
+++ b/xdgnjobs/ximple-jobcarrier/.gitignore
@@ -1 +1,2 @@
 /target/
+/xjobcarrier.log

--
Gitblit v0.0.0-SNAPSHOT