Index: ppapi/cpp/audio.h |
=================================================================== |
--- ppapi/cpp/audio.h (revision 124481) |
+++ ppapi/cpp/audio.h (working copy) |
@@ -19,8 +19,13 @@ |
class InstanceHandle; |
/// An audio resource. Refer to the |
+<<<<<<< .mine |
+/// <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio</a> |
+/// chapter in the Developer's Guide for information on using this interface. |
+======= |
/// <a href="/native-client/devguide/coding/audio">Audio</a> |
/// chapter in the Developer's Guide for information on using this interface. |
+>>>>>>> .r122520 |
class Audio : public Resource { |
public: |