[seam-commits] [seam/examples] c1f0bd: Revert "fix conflict"

[noreply at github.com]

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

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

Changed paths:
  M booking/pom.xml

Log Message:
-----------
Revert "fix conflict"

This reverts commit 4e3aa9d7c39323931862ba7007114530b68b67a7.


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

Changed paths:
  M booking/pom.xml

Log Message:
-----------
Revert "Revert "fix conflict""

This reverts commit c1f0bdd08a9bba088d8373f8d4b85f7186ff5551.


Compare: https://github.com/seam/examples/compare/4e3aa9d...cdb7c73