dashboard
repositories
filestore
activity
search
login
tmn
/
tmn-home
Home directory for Malawi's wwwroot
summary
reflog
commits
tree
docs
forks
compare
blame
|
history
|
raw
Added base files
Duncan Ewan
2021-02-19
3e758c29e0fde36fc088efcfc88f9a3014432b64
[tmn/tmn-home.git]
/
CFIDE
/
AIR
/
Conflict.cfc
1
2
3
4
5
6
<cfcomponent>
<cfproperty name="operation" type="string">
<cfproperty name="serverobject" type="any">
<cfproperty name="clientobject" type="any">
<cfproperty name="originalobject" type="any">
</cfcomponent>