Skip to content

V
venjob
Commit 2e647c60 by Huỳnh Thiên Phước
Options

fix conflict

parent 3b4c1b60
Pipeline #1028 failed with stages
in 0 seconds
Showing with 2 additions and 2 deletions
app/controllers/cities_controller.rb
class CitiesController < ApplicationController class CitiesController < ApplicationController
def index def index
@cities_vietnam = City.location(City::VIETNAM) @vietnam = City.location(City::VIETNAM)
@cities_international = City.location(City::FOREIGN) @international = City.location(City::FOREIGN)
end end
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment