JDF-148 showing how to create new beans using DeltaSpike utilities

wildfly · Dec 23, 2012 · 3c08b9d · 3c08b9d
1 parent 85cee21
commit 3c08b9d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 *~
 target
 .DS_Store