modify confrict file inagawa
scenario 変更
Merge pull request #2 from s-inagawa/hoge

initial commit
基底クラスの追加
シングルトンクラスをメソッドで渡さないようにする
Merge pull request #3 from sakamoto-rh/master

scenario 変更
InterfaceをSchenariosと統一
Merge pull request #4 from ohta-rh/feature/main

InterfaceをSchenariosと統一
conflict merge
Merge pull request #5 from kzy52/master

基底クラスの追加
Merge pull request #7 from canujohann/feature/customer

Feature/customer
Merge branch 'master' of github.com:rawhide/proxy_pattern into feature/customer