Update Run
Merge branch 'master' of https://github.com/nikyusof/tvsunnah

Conflicts:
	logs/application.log

project/target/resolution-cache/default/tvsunnah-build/scala_2.10/sbt_0.
13/0.1-SNAPSHOT/resolved.xml.properties

project/target/resolution-cache/default/tvsunnah-build/scala_2.10/sbt_0.
13/0.1-SNAPSHOT/resolved.xml.xml

project/target/resolution-cache/reports/default-tvsunnah-build-compile-i
nternal.xml

project/target/resolution-cache/reports/default-tvsunnah-build-compile.x
ml
	project/target/resolution-cache/reports/default-tvsunnah-build-docs.xml

project/target/resolution-cache/reports/default-tvsunnah-build-optional.
xml

project/target/resolution-cache/reports/default-tvsunnah-build-plugin.xm
l
	project/target/resolution-cache/reports/default-tvsunnah-build-pom.xml

project/target/resolution-cache/reports/default-tvsunnah-build-provided.
xml

project/target/resolution-cache/reports/default-tvsunnah-build-runtime-i
nternal.xml

project/target/resolution-cache/reports/default-tvsunnah-build-runtime.x
ml

project/target/resolution-cache/reports/default-tvsunnah-build-scala-too
l.xml

project/target/resolution-cache/reports/default-tvsunnah-build-sources.x
ml

project/target/resolution-cache/reports/default-tvsunnah-build-test-inte
rnal.xml
	project/target/resolution-cache/reports/default-tvsunnah-build-test.xml
	project/target/streams/$global/update/$global/out
	project/target/streams/$global/update/$global/output

target/resolution-cache/reports/thedonorschoice-thedonorschoice_2.10-com
pile-internal.xml

target/resolution-cache/reports/thedonorschoice-thedonorschoice_2.10-com
pile.xml

target/resolution-cache/reports/thedonorschoice-thedonorschoice_2.10-doc
s.xml

target/resolution-cache/reports/thedonorschoice-thedonorschoice_2.10-opt
ional.xml

target/resolution-cache/reports/thedonorschoice-thedonorschoice_2.10-plu
gin.xml

target/resolution-cache/reports/thedonorschoice-thedonorschoice_2.10-pom
.xml

target/resolution-cache/reports/thedonorschoice-thedonorschoice_2.10-pro
vided.xml

target/resolution-cache/reports/thedonorschoice-thedonorschoice_2.10-run
time-internal.xml

target/resolution-cache/reports/thedonorschoice-thedonorschoice_2.10-run
time.xml

target/resolution-cache/reports/thedonorschoice-thedonorschoice_2.10-sca
la-tool.xml

target/resolution-cache/reports/thedonorschoice-thedonorschoice_2.10-sou
rces.xml

target/resolution-cache/reports/thedonorschoice-thedonorschoice_2.10-tes
t-internal.xml

target/resolution-cache/reports/thedonorschoice-thedonorschoice_2.10-tes
t.xml

target/resolution-cache/thedonorschoice/thedonorschoice_2.10/1.0-SNAPSHO
T/resolved.xml.properties

target/resolution-cache/thedonorschoice/thedonorschoice_2.10/1.0-SNAPSHO
T/resolved.xml.xml
	target/scala-2.10/cache/tvsunnah/compile/play_instrumentation
	target/scala-2.10/cache/tvsunnah/global/copy-assets
	target/scala-2.10/cache/tvsunnah/global/javascripts
	target/scala-2.10/cache/tvsunnah/global/less
	target/streams/$global/update/$global/out
	target/streams/$global/update/$global/output
	target/streams/compile/copyResources/$global/copy-resources