Solved conflicts from app/models/repository.rb

ec662fcf · Jose Vargas · f5e08261 · ec662fcf
Commit ec662fcf authored Aug 02, 2018 by Jose Vargas
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/models/repository.rb app/models/repository.rb +0 -3

No files found.
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
-<<<<<<< HEAD
 # coding: utf-8
-=======
->>>>>>> upstream/master
 # frozen_string_literal: true
 require 'securerandom'