release: 1.1.60

[lilypond.git] / lily / include / note-head-side.hh

diff --git a/lily/include/note-head-side.hh b/lily/include/note-head-side.hh
index c5f7b0167c0e09e61ed2293a92373aa746e0ae5c..421ad9c57d4fbec7379f92ece70935566eaea0ce 100644 (file)
--- a/lily/include/note-head-side.hh
+++ b/lily/include/note-head-side.hh
@@ -21,7 +21,8 @@ class Note_head_side: public virtual Item
 {
   Link_array<Item> support_l_arr_;
 public:
-  Direction align_dir_;
+  // naming to avoid conflict with Align_element
+  Direction notehead_align_dir_;
 
   Note_head_side ();
   void add_support (Item*);