.
.

Conflicts:
	logs/application.log

target/resolution-cache/acronyms/acronyms_2.10/1.0-SNAPSHOT/resolved.xml
.properties

target/resolution-cache/acronyms/acronyms_2.10/1.0-SNAPSHOT/resolved.xml
.xml

target/resolution-cache/reports/acronyms-acronyms_2.10/compile-internal-
resolved.xml

target/resolution-cache/reports/acronyms-acronyms_2.10/compile-resolved.
xml

target/resolution-cache/reports/acronyms-acronyms_2.10/docs-resolved.xml

target/resolution-cache/reports/acronyms-acronyms_2.10/optional-resolved
.xml

target/resolution-cache/reports/acronyms-acronyms_2.10/plugin-resolved.x
ml
	target/resolution-cache/reports/acronyms-acronyms_2.10/pom-resolved.xml

target/resolution-cache/reports/acronyms-acronyms_2.10/provided-resolved
.xml

target/resolution-cache/reports/acronyms-acronyms_2.10/runtime-internal-
resolved.xml

target/resolution-cache/reports/acronyms-acronyms_2.10/runtime-resolved.
xml

target/resolution-cache/reports/acronyms-acronyms_2.10/sources-resolved.
xml

target/resolution-cache/reports/acronyms-acronyms_2.10/test-internal-res
olved.xml

target/resolution-cache/reports/acronyms-acronyms_2.10/test-resolved.xml
	target/scala-2.10/cache/Acronyms/compile/inc_compile
	target/scala-2.10/cache/Acronyms/compile/play_instrumentation
	target/scala-2.10/cache/Acronyms/global/update/output
	target/scala-2.10/src_managed/main/controllers/routes.java
	target/scala-2.10/src_managed/main/routes_reverseRouting.scala
	target/scala-2.10/src_managed/main/routes_routing.scala
	target/scala-2.10/src_managed/main/views/html/index.template.scala
	target/scala-2.10/src_managed/main/views/html/main.template.scala

target/scala-2.10/src_managed/main/views/html/partials/api.template.scal
a

target/scala-2.10/src_managed/main/views/html/partials/app.template.scal
a

target/scala-2.10/src_managed/main/views/html/partials/bookmarks.templat
e.scala