From 3c08b9de4f5ede68ffec2a0c08599e1701510d6a Mon Sep 17 00:00:00 2001
From: Rafael Benevides <rafabene@gmail.com>
Date: Thu, 22 Nov 2012 05:41:16 -0800
Subject: [PATCH] JDF-148 showing how to create new beans using DeltaSpike
 utilities

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 2c1fdb4e1f..095a09d471 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 *~
 target
 .DS_Store