[ros-diffs] [tfaber] 75746: [NTFS] - Try to make SVN less confused about merging

Author: tfaber
Date: Sun Sep  3 08:46:01 2017
New Revision: 75746

URL: http://svn.reactos.org/svn/reactos?rev=75746&view=rev
Log:
[NTFS]
- Try to make SVN less confused about merging

Modified:
    branches/GSoC_2016/NTFS/media/rapps/utorrent.txt   (props changed)

Propchange: branches/GSoC_2016/NTFS/media/rapps/utorrent.txt
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Sep  3 08:46:01 2017
@@ -23,4 +23,4 @@

/branches/usb-bringup/media/rapps/utorrent.txt:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk/media/rapps/utorrent.txt:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup/media/rapps/utorrent.txt:54809-54998
-/trunk/reactos/media/rapps/utorrent.txt:71196-75520,75691-75743
+/trunk/reactos/media/rapps/utorrent.txt:71196-75745