Resolve conflict in g6t4.yml
[pub/jan/aic18.git] / service-twitter / src / main / resources /
drwxr-xr-x   ..
-rw-r--r-- 396 application.yml