Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/Leeforall/NFCShopping
Browse files Browse the repository at this point in the history 
Conflicts:
	WebSite/WebSite/NFCShoppingWebSite.csproj
	WebSite/WebSite/WebPages/DiscountItemAdd.aspx.cs
  • Loading branch information
@EternalWind
EternalWind committed Apr 11, 2012
2 parents 346c2c3 + 14d5839 commit 3d04b39
Show file tree
Hide file tree
Showing 50 changed files with 746 additions and 444 deletions.
109 changes: 41 additions & 68 deletions WebSite/WebSite/Access_Data/ShopEntities.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3d04b39

Please sign in to comment.