[seam-commits] [seam/examples] 4e3aa9: fix conflict

[noreply at github.com]

Branch: refs/heads/master
Home:   https://github.com/seam/examples

Commit: 4e3aa9d7c39323931862ba7007114530b68b67a7
    https://github.com/seam/examples/commit/4e3aa9d7c39323931862ba7007114530b68b67a7
Author: Shane Bryzak <sbryzak at gmail.com>
Date:   2011-03-26 (Sat, 26 Mar 2011)

Changed paths:
  M booking/pom.xml

Log Message:
-----------
fix conflict