Settled Merge Conflicts.

1 files changed, 2 insertions, 4 deletions

diff --git a/generate.sh b/generate.sh
index 328a08f..9c3960f 100755
--- a/generate.sh
+++ b/generate.sh
@@ -22,10 +22,7 @@ bundle exec rails generate scaffold match status:integer tournament:references n
 bundle exec rails generate scaffold team match:references $NOTEST
 bundle exec rails generate scaffold alert author:references message:text $NOTEST
 bundle exec rails generate scaffold pm author:references recipient:references message:text $NOTEST
-bundle exec rails generate scaffold tournament name:string:unique game:references status:integer \
-	min_players_per_team:integer max_players_per_team:integer \
-	min_teams_per_match:integer max_teams_per_match:integer \
-	set_rounds:integer randomized_teams:boolean
+bundle exec rails generate scaffold tournament name:string:unique game:references status:integer ger randomized_teams:boolean
 bundle exec rails generate scaffold game \
 	name:text \
 	min_players_per_team:integer max_players_per_team:integer \
@@ -40,6 +37,7 @@ bundle exec rails generate model server_setting $NOTEST
 bundle exec rails generate model game_setting game:references type:integer name:string default:text discription:text type_opt:text display_order:integer $NOTEST
 bundle exec rails generate model tournament_preference tournament:references vartype:integer name:string value:text $NOTEST
 bundle exec rails generate model score user:references match:references value:integer $NOTEST
+bundle exec rails generate model remote_username game:references user:references json_value:text
 
 # Join tables
 bundle exec rails generate migration CreateTournamentPlayersJoinTable	players	tournaments