search

adlnet / xAPI-Spec

The xAPI Specification describes communication about learner activity and experiences between technologies.
https://adlnet.gov/projects/xapi/
907 stars 404 forks source link

Conflict fix #1040

Closed garemoko closed 7 years ago

garemoko commented 7 years ago

Merges https://github.com/adlnet/xAPI-Spec/commit/2039878b3393b681f423f4dfa8b5569d8ecb7ea9 and resolves conflicts with master

andyjohnson commented 7 years ago

+1 and merging as it is an aesthetic change