Permalink
Browse files

Merge branch 'feature1'

Conflicts:
	test1.sql
  • Loading branch information...
2 parents 5a872a7 + a263d25 commit 1c7eb0bb70e307423507d95df7ec7c87ec1d163f @benneic committed Aug 18, 2011
Showing with 1 addition and 0 deletions.
  1. +1 −0 newfeature.sql
View
@@ -0,0 +1 @@
+SELECT * FROM features

0 comments on commit 1c7eb0b

Please sign in to comment.